Miscellaneous fixes to UI