NavController + enhanced views
fix