minor layout adjust to html & removal of address-2 (not required)