seperated addresses in edit view for validation and some fixes