Cleanup, added single link view