Fixed navigation bugs from Navigation bean changes