Diff view improvements

Addresses the diff view confusion in the UI. There are lots 'o template changes @cmc333333.