Comment broken line for now
Redesign address display and update