menu stuff
fixed conflicts