Some small UI fixes