Fixed the menus to use the template