Restructured layout to be more simple
Merge pull request #7 from villanuevawill/master

Restructured layout to be more simple