Fixed issue of updating states upon changed country and
restored address form in the original concept.