Changed width to outerWidth for border and this kind of stuff calcs