continue redesign, changed the header behaviour