More padding improvements