Cleaning templates

some minor template cleanup. Woud fix more but don't want to break @StealthWombat 's work..