Simpler Menu

Doesn't rely upon the navigation block anymore.