Making the ES DD form readable

For certain definitions of readable and usable.

Change-Id: I6f1948dded0e4592c667b74f7b6ae2c768c373a3
Merge "Making the ES DD form readable"