Spring over navigation

Enhancements