Added Date Format and Key Navigation