Updated layout
Merge pull request #5 from ManagedPixels/develop

Updated layout