General changes and fixes to UI