Reorder Header widgets to be consistent with Uberfire (and a more natural hierachy of menus)