Fixing more issues with padding