Running into problems with a percentage width/height and a parent contai...

...ner that had a border. Changed border width calculation to use border width properties.