implemented date and time pickers on when page
resolving merge conflict again