UI improvements from Tero

Fixes #35.