Added borders to height and padding calculations.