moved secret_token to be auto generated if it doesn't exists and added some date formates
tweaking forms