Merge pull request #6 from andrewkim/prototype2

Prototype2
Update menu and add submenu placeholder