refactored addresses view