Merge pull request #160 from christianwach/master

EDIT: Layout and design fixes