more changes to menus and stuff