add Menu, still lots of bugs