Reorder NavBar components to be consistent with Uberfire