fixed more / menu bug
fixed merge conflict