Fix for MAGN-174 and MAGN-176
Merge branch 'master' into MenuStylingFixInMaster
Updated fix for MAGN-174 and MAGN-176
Merge pull request #503 from SkyApple/MenuStylingFixInMaster

Fix for MAGN-174 and MAGN-176