made some changes, including adding time picker to forms