Fix working and Fix menu order