Fixing navigation in our application