Fixing menu order