Rework padding classes