Fixing padding and alignment