Minor fixes and improvements to the ui