menu and some fix