TE edit view UI updates, closes #95
Merge branch 'master' into builds
7.439