Feature/521 addr settings page