Added fixes for navigation and dates.