Adding FormDate and Fixing Button