Fix menu and minor fixes