Fixed menu buttons
fixed merge conflicts