Merge pull request #1 from decatan/master

General awesomeness, layouts better refined
hungyi changes to layout