edit Agency feature complete

Change-Id: I8330dcf4f7fc775cd7e70311368d9a98240ebbdc