WIP: UX improvements, date time picker works correctly