clean code- Nav conflict solved