Minor fixes to UI