WIP, layout adjustments
Rearrange templates and reduce padding
layout adjustment to support page
Merge pull request #61 from southpolesteve/layout_fix

Layout fix