added menu things
git merge