Worked on menus some more.