improved data source editing interface.

Change-Id: I42e79d0e95771371ce9d407b0a6dc7b2944bb3fe