Change to date style plus fixing wording