[TASK] Heavy rework

* Add UnitTests
* Use new DatePicker