It's probably best to keep the two changes separate. If and when this PR is merged, I'll open another one to add missing compare view links.