diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-forums/src/SakaiForums.js b/webcomponents/tool/src/main/frontend/packages/sakai-forums/src/SakaiForums.js
index fc5f35735879..9a46de527c8d 100644
--- a/webcomponents/tool/src/main/frontend/packages/sakai-forums/src/SakaiForums.js
+++ b/webcomponents/tool/src/main/frontend/packages/sakai-forums/src/SakaiForums.js
@@ -18,7 +18,7 @@ export class SakaiForums extends SakaiPageableElement {
 
   async loadAllData() {
 
-    this.messagesClass = "three-col";
+    this.messagesClass = !this.siteId ? "three-col" : "two-col";
 
     const url = this.siteId ? `/api/sites/${this.siteId}/forums/summary` : `/api/users/${this.userId}/forums/summary`;
     return fetch(url)
@@ -146,6 +146,7 @@ export class SakaiForums extends SakaiPageableElement {
             ${this._i18n.syn_discussion_heading}
           </a>
         </div>
+        ${!this.siteId ? html`
         <div class="header">
           <a href="javascript:;"
               @click=${this.sortBySite}
@@ -154,10 +155,13 @@ export class SakaiForums extends SakaiPageableElement {
             ${this._i18n.syn_site_heading}
           </a>
         </div>
+        ` : nothing}
       ${this.dataPage.map((m, i) => html`
         <div class="cell ${i % 2 === 0 ? "even" : "odd"}"><a href="${m.messageUrl}">${m.messageCount}</a></div>
         <div class="cell ${i % 2 === 0 ? "even" : "odd"}"><a href="${m.forumUrl}">${m.forumCount}</a></div>
+        ${!this.siteId ? html`
         <div class="cell ${i % 2 === 0 ? "even" : "odd"}"><a href="${m.siteUrl}">${m.siteTitle}</a></div>
+        ` : nothing}
       `)}
       </div>
     `;
diff --git a/webcomponents/tool/src/main/frontend/packages/sakai-tasks/src/SakaiTasks.js b/webcomponents/tool/src/main/frontend/packages/sakai-tasks/src/SakaiTasks.js
index ff2150117ca9..2d37a5171808 100644
--- a/webcomponents/tool/src/main/frontend/packages/sakai-tasks/src/SakaiTasks.js
+++ b/webcomponents/tool/src/main/frontend/packages/sakai-tasks/src/SakaiTasks.js
@@ -338,7 +338,9 @@ export class SakaiTasks extends SakaiPageableElement {
             </div>
           </div>
           <div class="task-block cell ${i % 2 === 0 ? "even" : "odd"}">
+            ${!this.siteId ? html`
             <div class="site-title">${t.siteTitle}</div>
+            ` : nothing}
             <div class="description">${t.description}</div>
             <div class="due-date"><span class="due">${this.i18n.due} </span>${t.dueHuman}</div>
             ${t.notes ? html`