Minor changes to UI
Merged