Menu is now wired up properly.
minor fixes
reverting