Removed old templates
More improvements to UI