More minor adjustments to form on required date and time