updates to theme templates and general layout