Various formatting and refactoring mainly in AddressDialog