Fixed few bugs in navigation which should be now working (in basis).