fix data cell
fix textarea
Merge branch 'develop'