added menu and buttons, fixed eventlistener