Improve data range picker