Fixing padding some more