added ui changes, some ui bug fixes
fixed merge conflicts
updated create address book view