Fix padding and margins