Bunch of UI changes/various fixes