Cleanup templates
Remove metis menus, fix bugs