Major change

Margin now becomes padding