Moved Date UI code to main
Merge remote-tracking branch 'origin/master'
merge