Moves layout to more generic name.
Updates to templates and layout.