Merge pull request #1 from stephenmcm/working

Pulling in menu updates and general clean up.
Merge pull request #2 from stephenmcm/Navigation

Navigation start. Working but buttons need listeners