Various minor UI fixes (fixes #18 and #17)