new header and section buttons
fixed merge