added shim
Refactored the profile layout
Merge pull request #1 from decatan/master

General awesomeness, layouts better refined