Fixed major menu bug. Minor code edits.
Merged remote with local