Minor fixes to UI
Ui work