Merge pull request #10 from gadams00/master

Fixing several hard-coded menu locations and removing event calendar lin...