Added support for padding/borders in modern browsers