Bunch of small UI fixes