menu structure various changes

almost finished