Fixing up the padding