split up templates and did some design work