Setting height before adding margins

It's a more common pattern to set the size and then add the margins


(cherry picked from commit 0f2ca306)