Nicer layout
Merge pull request #24 from Grogs/master

Nicer layout