I still think we could use a more compact header for the non-expanded mode (ala 2.49). To be addressed later