Some more eye candy

A bugfix and more UI tweaks