styling fixes, #16588