Move other uses of padding and margin to base-px
Merge