diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ab5079b2..8a122c9c 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -57,8 +57,8 @@
     "/chunks/plan.js": "/chunks/plan.js?id=455369be23d3cd71dff8",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=c1ad8299871917f21f8e",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=1758abef76d231b6518e",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=666e27c41ff13620423f",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=ce4702351692c66cc960",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=d05adc407c271c7ece76",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=56503b9ff882c9a4acd5",
     "/chunks/plans.js": "/chunks/plans.js?id=3b56fd7dabcdba705177",
     "/chunks/platform.js": "/chunks/platform.js?id=dc3c6677ab43d4475b66",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=e64e3b67ccb89de9dd55",
@@ -386,5 +386,19 @@
     "/chunks/plans.7b393e64ca4234f841f4.hot-update.js": "/chunks/plans.7b393e64ca4234f841f4.hot-update.js",
     "/chunks/plans.3a81c8451624f125bbbb.hot-update.js": "/chunks/plans.3a81c8451624f125bbbb.hot-update.js",
     "/chunks/plan-subscribers.8b4339208930e77219f6.hot-update.js": "/chunks/plan-subscribers.8b4339208930e77219f6.hot-update.js",
-    "/chunks/plan-subscribers.3adaea2b4186727f2968.hot-update.js": "/chunks/plan-subscribers.3adaea2b4186727f2968.hot-update.js"
+    "/chunks/plan-subscribers.3adaea2b4186727f2968.hot-update.js": "/chunks/plan-subscribers.3adaea2b4186727f2968.hot-update.js",
+    "/chunks/plan-settings.005da13d5462737fd53d.hot-update.js": "/chunks/plan-settings.005da13d5462737fd53d.hot-update.js",
+    "/chunks/plan-settings.929887fed8469046f901.hot-update.js": "/chunks/plan-settings.929887fed8469046f901.hot-update.js",
+    "/chunks/plan-settings.c849b8df55d0c41c000a.hot-update.js": "/chunks/plan-settings.c849b8df55d0c41c000a.hot-update.js",
+    "/chunks/plan-settings.644782b406869b8292df.hot-update.js": "/chunks/plan-settings.644782b406869b8292df.hot-update.js",
+    "/chunks/plan-settings.f4173276099fd67c0daa.hot-update.js": "/chunks/plan-settings.f4173276099fd67c0daa.hot-update.js",
+    "/chunks/plan-settings.5f2c4fdf68309668953d.hot-update.js": "/chunks/plan-settings.5f2c4fdf68309668953d.hot-update.js",
+    "/chunks/plan-settings.3ecc3a0393896290355b.hot-update.js": "/chunks/plan-settings.3ecc3a0393896290355b.hot-update.js",
+    "/chunks/plan-settings.c1f16d9ea4d9f13e3284.hot-update.js": "/chunks/plan-settings.c1f16d9ea4d9f13e3284.hot-update.js",
+    "/chunks/plan-settings.e2a8cc1e15e02a065176.hot-update.js": "/chunks/plan-settings.e2a8cc1e15e02a065176.hot-update.js",
+    "/chunks/plan-settings.c6fe98ced769cb0621f6.hot-update.js": "/chunks/plan-settings.c6fe98ced769cb0621f6.hot-update.js",
+    "/chunks/plan-settings.7dca29b888c3a237159b.hot-update.js": "/chunks/plan-settings.7dca29b888c3a237159b.hot-update.js",
+    "/chunks/plan-settings.246b354ee7dd351c9f46.hot-update.js": "/chunks/plan-settings.246b354ee7dd351c9f46.hot-update.js",
+    "/chunks/plan-subscribers.2efcff3d00fecc9faa00.hot-update.js": "/chunks/plan-subscribers.2efcff3d00fecc9faa00.hot-update.js",
+    "/chunks/plan-subscribers.4e131483ac7b313c58e6.hot-update.js": "/chunks/plan-subscribers.4e131483ac7b313c58e6.hot-update.js"
 }
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
index 073b15ba..27794679 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
+++ b/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
@@ -1,32 +1,44 @@
 <template>
-	<div class="card shadow-card">
-		<FormLabel>
-			{{ $t('admin_page_plans.form.title_details') }}
-		</FormLabel>
+	<div>
+		<div class="card shadow-card">
+			<FormLabel>
+				{{ $t('Details') }}
+			</FormLabel>
 
-		<!--Visible-->
-		<AppInputSwitch :title="$t('admin_page_plans.form.status')" :description="$t('admin_page_plans.form.status_help')">
-			<SwitchInput @input="$updateText('/admin/plans/' + $route.params.id, 'visible', plan.attributes.visible)" v-model="visible" class="switch" :state="plan.attributes.visible"/>
-		</AppInputSwitch>
+			<!--Visible-->
+			<AppInputSwitch :title="$t('admin_page_plans.form.status')" :description="$t('admin_page_plans.form.status_help')">
+				<SwitchInput @input="$updateText('/admin/plans/' + $route.params.id, 'visible', plan.attributes.visible)" v-model="visible" class="switch" :state="plan.attributes.visible"/>
+			</AppInputSwitch>
 
-		<!--Name-->
-		<AppInputText :title="$t('admin_page_plans.form.name')">
-			<input @input="$updateText('/admin/plans/' + $route.params.id, 'name', plan.attributes.name)" v-model="plan.attributes.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" class="focus-border-theme input-dark"/>
-		</AppInputText>
+			<!--Name-->
+			<AppInputText :title="$t('admin_page_plans.form.name')">
+				<input @input="$updateText('/admin/plans/' + $route.params.id, 'name', plan.attributes.name)" v-model="plan.attributes.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" class="focus-border-theme input-dark"/>
+			</AppInputText>
 
-		<!--Description-->
-		<AppInputText :title="$t('admin_page_plans.form.description')">
-			<textarea @input="$updateText('/admin/plans/' + $route.params.id, 'description', plan.attributes.description)" v-model="plan.attributes.description" :placeholder="$t('admin_page_plans.form.description_plac')" class="focus-border-theme input-dark"></textarea>
-		</AppInputText>
+			<!--Description-->
+			<AppInputText :title="$t('admin_page_plans.form.description')">
+				<textarea @input="$updateText('/admin/plans/' + $route.params.id, 'description', plan.attributes.description)" v-model="plan.attributes.description" :placeholder="$t('admin_page_plans.form.description_plac')" class="focus-border-theme input-dark"></textarea>
+			</AppInputText>
 
-		<!--Storage Capacity-->
-		<AppInputText :title="$t('admin_page_plans.form.storage')" :description="$t('admin_page_plans.form.storage_helper')" is-last="">
-			<input @input="$updateText('/admin/plans/' + $route.params.id, 'capacity', plan.attributes.capacity)" v-model="plan.attributes.features.max_storage_amount" :placeholder="$t('admin_page_plans.form.storage_plac')" type="number" min="1" max="999999999" class="focus-border-theme input-dark"/>
-		</AppInputText>
+			<InfoBox style="margin-bottom: 0">
+				<p>{{ $t('Price change is not possible. If you would like to change your price or currency, please feel free to create a new plan.') }}</p>
+			</InfoBox>
+		</div>
+		<div class="card shadow-card">
+			<FormLabel>
+				{{ $t('Features') }}
+			</FormLabel>
 
-		<InfoBox style="margin-bottom: 0">
-			<p>{{ $t('admin_page_plans.disclaimer_edit_price') }}</p>
-		</InfoBox>
+			<!--Storage Capacity-->
+			<AppInputText :title="$t('admin_page_plans.form.storage')" :description="$t('admin_page_plans.form.storage_helper')">
+				<input @input="$updateText('/admin/plans/' + $route.params.id, 'max_storage_amount', plan.attributes.max_storage_amount)" v-model="plan.attributes.features.max_storage_amount" :placeholder="$t('admin_page_plans.form.storage_plac')" type="number" min="1" max="999999999" class="focus-border-theme input-dark"/>
+			</AppInputText>
+
+			<!--Team Members-->
+			<AppInputText :title="$t('Max Team Members')" is-last="true">
+				<input @input="$updateText('/admin/plans/' + $route.params.id, 'max_team_members', plan.attributes.max_team_members)" v-model="plan.attributes.features.max_team_members" :placeholder="$t('Add max team members in number')" type="number" min="1" max="999999999" class="focus-border-theme input-dark"/>
+			</AppInputText>
+		</div>
 	</div>
 </template>
 
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
index 6ca04b70..9b4daa51 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
+++ b/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
@@ -6,7 +6,7 @@
 			<template slot-scope="{ row }">
 				<tr class="border-b dark:border-opacity-5 border-light border-dashed">
 					<td>
-						<div class="flex items-center">
+						<router-link class="flex items-center" :to="{name: 'UserDetail', params: {id: row.data.relationships.user.data.id}}">
 							<MemberAvatar
 								:is-border="false"
 								:size="36"
@@ -20,7 +20,7 @@
 									{{ row.data.relationships.user.data.attributes.email }}
 								</span>
 							</div>
-						</div>
+						</router-link>
 					</td>
 					<td>
 						<ColorLabel :color="getSubscriptionStatusColor(row.data.attributes.status)">