DC: HUGE cleanup, rework layout

Change-Id: I117767f43c29fa0e97defdf372186d7967a0f047