Added fish views, links, new tests (passed)