btn header and btn expand tweaks