Added UI and Templating