Reworked header and drawer.