changed format date AND added cancel button to forms