Resolved #201-5 and #201-6
Merge pull request #202 from jcadek/master

Fixing Broken Menus (Resolved #201-5 and #201-6)