Fixed some minor menu issues
Merge branch 'fix-menu-issues' into develop