dc changes, and ui tweeks
conflicts