More adjustments to padding