Improve sorting
Cleanup
Lock refreshing out if scrolled