Fix margin-padding bug