fix #7 Refactoring

* simplefy Menu composits
* modify test