Take into account padding and margins on content

Changed the height and widths calculations of the content div to
include any padding and/or margins.