Update form and sorting
Merge branch 'dev'