Fixing menu returns