Add better data source dropdown
Add different date pickers for differnt use cases