Fixed the templates, integrated the front-end and back-end