Cleaned up NavigationCtrl and fixed nav not hiding after click