Fix view issues. Fix routes