Fixed navigation controller issue