More tweeks to template