Fixed some issues

A few niggling UI problems that have been bothering me for ages.
Fixes #41