Better Layout and Bugfixes
Merge pull request #2 from barning/master

Better Layout and Bugfixes