fix bug 868103 - Update main menu

https://bugzilla.mozilla.org/show_bug.cgi?id=868103

Hidden behind a waffle flag of "new_menu"