Tweak height and width calculations and syntax