Fixing some padding issues on p