Improved Border measure/arrange.

Take into account BorderThickness.