- Fix critical navigation bug 
