UI: Bunch of fixes for the previous commit