Spring over navigation

Updates