Diff view layout revised and jelly file cleaned up