fixes to the UI