Added initial address modal
Removed old approach for addresses
Merge branch 'address_management'