Fixed some padding issues