Code cleanup
Cleanup, range bar is now in center of handles
Merge from master
Optimisations for range bar positioning
Merge branch 'optimisations'