Minor UI fixes
First commit