Put back right version of diffviewer
Remove cross shapes from demo