btn-expand tweaks, hr tweaks