added menu and some other stuff