Fixing menu bug