Add a date picker and fix the back button navigation.
Cleaned up some issues in navigation.