Merge "Update the datetime page UI" into main