fixing some spacing and padding issues