Working

Pulling in menu updates and general clean up.