Fixing menu builder