Fix some issues with button-header.