Updated to template layout