Fix textarea
Merge remote-tracking branch 'origin/front'