fix address not being retained, some refactoring
fix address not being retained, some refactoring

jashot7/openbazaar-desktop,OpenBazaar/openbazaar-desktop,jashot7/openbazaar-desktop,jashot7/openbazaar-desktop,OpenBazaar/openbazaar-desktop,OpenBazaar/openbazaar-desktop