order of buttons, install address city/prov
Merge branch 'installation-address-changes'