WIP, layout adjustments
Rearrange templates and reduce padding
layout adjustment to support page