Fix/Improve Date/Time Widget