Layout fixes to UI