cleaning menu
First working draft, close #7 and close #8