Updated model for in-place rendering of JSON comment view
Small layout improvement
Merge branch 'v2' into v3