1. Adding date picker.
2. Cleaning up the code and the UI a bit.