Fixing padding stuff