menu changes
fixed merge conflicts