getting there all menus almost done
Merge branch 'master'