Fix note area after barcode expand.
Clean up address formatting