Menu action and cleanup as much as I can.
Merge pull request #4 from caveofgeek/feature/menu-action

Menu action.