small fixes to navigation controller