Made updates to templates and routes in frontend, ersolved merge conflicts