Changed Address1/Address2 to Shipping Address and Shipping Address 2 on edit user form
Moved call to set sidebar column height until after main column has been set, to create proper heights.