Added sorting
Modified sorting handle
Merge branch 'sorting' into develop