UI: Bunch of fixes