Additional Fix and Cleanup Date Nav

Additional Fix and Cleanup Date Nav
Merge pull request #1216 from mkly/fix_date_navigation

Additional Fix and Cleanup Date Nav