Fixed several bugs in the navigation
Merge branch 'iris-grunt' of https://github.com/iris-js/iris into iris-grunt
Two Tests fixed