added template for new component
flattened address country and appended address string
refactored useage of component
fixed timing issue