Tidy up compact navbar in M2.8.