Make details and deed steps more sane

...sort of.

Change-Id: I5f47568103208f4a02474d648ba4aafd3fc9d023
Merge "Make details and deed steps more sane"