Cleanup and finalize the new "visibility optimized" menus
Merge pull request #332 from ThePlayground/master

Cleanup and finalize the new "visibility optimized" menus