Fix some regressions after improving styled button structure