Add border and tweak heights.