Expand buttons now are rendered consistently