Cleanup API v2 Link Generation and Views

Change-Id: I2776f7cd706710d513a8e472fc89bd86f7f678b2