Minor layout improvements
Merge pull request #559 from nsendetzky/master

Minor layout improvements