Note previews display during mousemove
Note deletion now works
Interface cleaned up for prototype
resolve merge conflict
Merge branch 'tw' into develop