Improved collapsible header behaviour