Fix sort
Merge branch 'master' of github.com:1000ideas/l
Fix context menu on scroll