Fixed B2B views with the new repo & minor code revisions