Menu Module Updates

Mostly updates to the menu module. Various other fixes.