fixed the menu stuff... good across the board now