More structure for root.tmpl
Template adjuments