Improved padding to each works