Cleaner menus + separation of templating