Merge pull request #394 from leider/master

minor UI tweaks and solution for #385