DELETE comment area
Reposition preview and note areas
Merge branch 'features' into development
Merge branch 'development'