Updated the templates and UI