Style & layout fixes

Small visual bug fixes