modified in order to use sortable UI interaction
Merge branch 'origin/wisp'