Fixes minor layout issues
Merge pull request #573 from nsendetzky/master

Fixes minor layout issues