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

...k