diff --git a/dashboard/src/components/list/ListControl.svelte b/dashboard/src/components/list/ListControl.svelte
index 01a78143..bb1f7780 100644
--- a/dashboard/src/components/list/ListControl.svelte
+++ b/dashboard/src/components/list/ListControl.svelte
@@ -81,13 +81,19 @@ function resetPage() {
 
 <Card class="mb-3">
 <CardHeader>
-    <CardTitle class="d-flex justify-content-between align-items-center mb-0">
-        <div>
-            <div class="icon d-inline-block">
-                <FaSearch />
-            </div> Control {pageOptions.type} list
-        </div>
-        <Button color="primary" on:click={() => advanced = !advanced}>Toggle advanced mode</Button>
+    <CardTitle class="mb-0">
+        <Row class="justify-content-between align-items-center ">
+            <Col xs={12} md={8} xl={9}>
+                <div class="icon d-inline-block">
+                    <FaSearch />
+                </div> Control {pageOptions.type} list
+            </Col>
+            {#if !pageOptions.isPublic}
+                <Col xs={12} md={4} xl={3} class="mt-2 mt-md-0">
+                    <Button class="w-100" color="primary" on:click={() => advanced = !advanced}>Toggle advanced mode</Button>
+                </Col>
+            {/if}
+        </Row>
     </CardTitle>
 </CardHeader>
 <CardBody>
diff --git a/dashboard/src/routes/Dash/Profile.svelte b/dashboard/src/routes/Dash/Profile.svelte
index cc08cf1c..1caf184f 100644
--- a/dashboard/src/routes/Dash/Profile.svelte
+++ b/dashboard/src/routes/Dash/Profile.svelte
@@ -107,7 +107,7 @@
             <Alert color="info" aria-hidden>You are currently <b>viewing</b> a system.</Alert>
             <TabContent class="mt-3" on:tab={(e) => navigateTo(e.detail, listView)}>
                 <TabPane tabId="system" tab="System" active={tabPane === "system"}>
-                    <SystemMain bind:user={user} isPublic={false} />
+                    <SystemMain bind:user={user} isPublic={true} />
                 </TabPane>
                 <TabPane tabId="members" tab="Members" active={tabPane === "members"}>
                     <List on:viewChange={(e) => navigateTo("members", e.detail)} bind:otherList={groupList} bind:lists={memberList} bind:pageOptions={memberListPageOptions} bind:options={memberListOptions} />