Improved padding & alignments