Added padding and margin properties