Correct Menu implemented
Merge pull request #1 from 2rachy/menu_setup

Correct Menu implemented