Various small UI fixes