Requesting a pull to mozilla:master from k88hudson:1026619

If these are uniquely tied to the navbar then why make them variables?