Change menu and some fixes