fix by full screen edit
fix form
Merge branch 'dev'