My first commit -fixed menu items not to crash
Merge branch 'fixedMenu'