Minor fixes to the UI