Additional Fix and Cleanup Date Nav

Additional Fix and Cleanup Date Nav