let's do menus the right way

cleaned up a bunch of bad code