setup text view
fix bugs
Merge branch 'feature/6.7' into develop