More work on menus with my theme