various changes to menu stuff