Fixing menu problem