Merge pull request #483 from leider/master

UI-stuff (layout changes, housekeeping)