Customer / Billing section tweaks. #1684