Updated front end template rendering