margin/padding units changed to px and %