fixed menus, and simplying things a bit