Fix menu and some bug