Merge pull request #390 from leider/master

small adaptions in UI