menu reorganized, several design changes