Fixing navigation template issue