Grid padding improvements