Some minor UI changes.
Added Main Menu JSON support.

Menu is now stored as JSON.
Cleaned up code.