Clean-up of templates directory
Bugfixes and improved UI