merged templates and front end