
and remove default navigation classes in favor of the navigation classes (cherry picked from commit b63d24ac1ab1253a62b6a2886f11953539f13340)
and remove default navigation classes in favor of the navigation classes (cherry picked from commit b63d24ac1ab1253a62b6a2886f11953539f13340)