cleanup & added done button to address activity