diff --git a/src/main/frontend/src/components/GroupMembers.svelte b/src/main/frontend/src/components/GroupMembers.svelte
index 14bea93b..e48040dd 100644
--- a/src/main/frontend/src/components/GroupMembers.svelte
+++ b/src/main/frontend/src/components/GroupMembers.svelte
@@ -1,5 +1,5 @@
 <script>
-	import SmallButton from '../components/SmallButton.svelte';
+	import SmallButton from './XSmallButton.svelte';
 	import { users } from '../stores/users.js';
 	import { mdiMinus, mdiPlus } from '@mdi/js';
 	import { Button, Icon } from 'svelte-materialify/src';
@@ -13,6 +13,7 @@
 
 	let transformedUsers = [];
 	let transformedMembers = [];
+	let transformedGroups = [];
 
 	function addUserToMembers() {
 		const index = selectUserElement.selectedIndex;
diff --git a/src/main/frontend/src/components/SmallButton.svelte b/src/main/frontend/src/components/XSmallButton.svelte
similarity index 100%
rename from src/main/frontend/src/components/SmallButton.svelte
rename to src/main/frontend/src/components/XSmallButton.svelte
diff --git a/src/main/frontend/src/routes/admin/groups.svelte b/src/main/frontend/src/routes/admin/groups.svelte
index 55817fcb..34e1817e 100644
--- a/src/main/frontend/src/routes/admin/groups.svelte
+++ b/src/main/frontend/src/routes/admin/groups.svelte
@@ -7,7 +7,7 @@
 	import CommonDialog from '../../components/CommonDialog.svelte';
 	import { dialogState, loading } from '../../shared/common.js';
 	import Table from '../../components/Table.svelte';
-	import SmallButton from '../../components/SmallButton.svelte';
+	import SmallButton from '../../components/XSmallButton.svelte';
 	import FloatAddButton from '../../components/FloatAddButton.svelte';
 	import GroupMembers from '../../components/GroupMembers.svelte';
 	import { fetchUsers } from '../../stores/users';
diff --git a/src/main/frontend/src/routes/admin/permissions.svelte b/src/main/frontend/src/routes/admin/permissions.svelte
index b7201eae..5c149919 100644
--- a/src/main/frontend/src/routes/admin/permissions.svelte
+++ b/src/main/frontend/src/routes/admin/permissions.svelte
@@ -7,7 +7,7 @@
 	import CommonDialog from '../../components/CommonDialog.svelte';
 	import { dialogState, loading } from '../../shared/common.js';
 	import Table from '../../components/Table.svelte';
-	import SmallButton from '../../components/SmallButton.svelte';
+	import XSmallButton from '../../components/XSmallButton.svelte';
 	import ConstraintsEditor from '../../components/ConstraintsEditor.svelte';
 	import FloatAddButton from '../../components/FloatAddButton.svelte';
 
@@ -175,15 +175,15 @@
 				<td>{permission.description}</td>
 				<td>{permission.constraints.map((c) => c.name).join(', ')}</td>
 				<td class="text-center table-row-actions">
-					<SmallButton
+					<XSmallButton
 						on:click={() => openManageConstraintsDialog(index)}
 						iconPath={mdiLock}
 						title="Manage permission constraints" />
-					<SmallButton
+					<XSmallButton
 						on:click={() => openUpdateDialog(index)}
 						iconPath={mdiPencil}
 						title="Update/edit permission" />
-					<SmallButton
+					<XSmallButton
 						on:click={() => openDeleteDialog(index)}
 						iconPath={mdiDelete}
 						title="Remove/delete permission" />
diff --git a/src/main/frontend/src/routes/admin/roles.svelte b/src/main/frontend/src/routes/admin/roles.svelte
index 5edce157..e5f1f3fd 100644
--- a/src/main/frontend/src/routes/admin/roles.svelte
+++ b/src/main/frontend/src/routes/admin/roles.svelte
@@ -7,7 +7,7 @@
 	import CommonDialog from '../../components/CommonDialog.svelte';
 	import { dialogState, loading } from '../../shared/common.js';
 	import Table from '../../components/Table.svelte';
-	import SmallButton from '../../components/SmallButton.svelte';
+	import SmallButton from '../../components/XSmallButton.svelte';
 	import FloatAddButton from '../../components/FloatAddButton.svelte';
 
 	let initialRole = {
diff --git a/src/main/frontend/src/routes/admin/tenants.svelte b/src/main/frontend/src/routes/admin/tenants.svelte
index 75a8c30d..27df79b9 100644
--- a/src/main/frontend/src/routes/admin/tenants.svelte
+++ b/src/main/frontend/src/routes/admin/tenants.svelte
@@ -6,7 +6,7 @@
 	import { tenants, create, update, remove } from '../../stores/tenantsSubscription.js';
 	import CommonDialog from '../../components/CommonDialog.svelte';
 	import { dialogState, loading } from '../../shared/common.js';
-	import SmallButton from '../../components/SmallButton.svelte';
+	import SmallButton from '../../components/XSmallButton.svelte';
 	import FloatAddButton from '../../components/FloatAddButton.svelte';
 
 	let initialTenant = {
diff --git a/src/main/frontend/src/routes/admin/users.svelte b/src/main/frontend/src/routes/admin/users.svelte
index 333a0abf..1b08bc68 100644
--- a/src/main/frontend/src/routes/admin/users.svelte
+++ b/src/main/frontend/src/routes/admin/users.svelte
@@ -7,7 +7,7 @@
 	import DeleteDialog from '../../components/DeleteDialog.svelte';
 	import CommonDialog from '../../components/CommonDialog.svelte';
 	import { dialogState, loading } from '../../shared/common.js';
-	import SmallButton from '../../components/SmallButton.svelte';
+	import SmallButton from '../../components/XSmallButton.svelte';
 	import FloatAddButton from '../../components/FloatAddButton.svelte';
 
 	let initialUser = {