Minor UI improvements. Fixes #34, fixes #35