More UI fixes
Merge pull request #3 from F1ynn/master

More minor UI fixes