Feature/702 address settings ui

Fix for #702 and #724.

DO NOT MERGE YET: I have removed a label in this branch. Before I could do that I had to clean my org because it thought a reference still existed in a VF page. We would most likely encounter the same issue in the packaging org. 

We have decided that this is a good use case to contact the ISV team about. We will create a package from this feature branch with the issue and reach out to them. If the issue doesn't get resolved in a timely manner and we want to push the changes, @jlantz will re-add the label (blank) to the branch.