fixd all the menus and stuff