UI: Bunch of improvements