Added zero padding and margin set