Fixed navigation, added params to routing