Fix menu (part 2)