Issue #157 - Move billing address configuration option to basic page