Getting the new layout sorted
Merge pull request #1 from monkstick/master

Getting the new layout sorted