Improved padding and margins