merge branch perms_ng into dev

28 files changed, 555 insertions, 275 deletions

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 686b40a54..28631ed68 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -24,6 +24,7 @@
 			{{if $abook_prev || $abook_next}}
 			<div class="btn-group">
 				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
+				{{if $sections}}
 				<div class="btn-group" >
 					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
 					<div class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel">
@@ -32,6 +33,7 @@
 						{{/foreach}}
 					</div>
 				</div>
+				{{/if}}
 				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
 			</div>
 			{{/if}}
@@ -40,6 +42,65 @@
 		<h2>{{$header}}</h2>
 	</div>
 	<div class="section-content-wrapper-np">
+		<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+
+		<input type="hidden" name="contact_id" value="{{$contact_id}}">
+		<input type="hidden" name="section" value="{{$section}}">
+
+		<div class="section-content-wrapper">
+			<a href="permcats/{{$permcat_value}}" class="float-end"><i class="fa fa-external-link"></i>&nbsp;{{$permcat_new}}</a>
+			{{include file="field_select.tpl" field=$permcat}}
+			<button type="button" class="btn btn-outline-secondary float-end" data-bs-toggle="modal" data-bs-target="#perms_modal">Permissions</button>
+			<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
+			<div class="modal" id="perms_modal" tabindex="-1" aria-labelledby="perms_modal_label" aria-hidden="true">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<div class="modal-title h3" id="perms_modal_label">Permissions Overview</div>
+							<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+						</div>
+						<div class="modal-body">
+
+							<table class="table table-hover table-sm">
+								<thead>
+									<tr>
+										<th scope="col">Permission</th>
+										<th scope="col">{{$them}}</th>
+										<th scope="col">{{$me}}</th>
+									</tr>
+								</thead>
+								<tbody>
+									{{foreach $perms as $perm}}
+									<tr>
+										<td>{{$perm.1}}</td>
+										<td>
+											{{if $perm.2}}
+											<i class="fa fa-check text-success"></i>
+											{{else}}
+											<i class="fa fa-times text-danger"></i>
+											{{/if}}
+										</td>
+										<td>
+											{{if $perm.3}}
+											<i class="fa fa-check text-success"></i>
+											{{else}}
+											<i class="fa fa-times text-danger"></i>
+											{{/if}}
+										</td>
+									</tr>
+									{{/foreach}}
+
+								</tbody>
+							</table>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
 		{{if $notself}}
 		{{foreach $tools as $tool}}
 		{{if $tool.info}}
@@ -73,33 +134,9 @@
 		</div>
 		{{/if}}
 
-		<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
-
-		<input type="hidden" name="contact_id" value="{{$contact_id}}">
-		<input type="hidden" name="section" value="{{$section}}">
-
 		<div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true">
 			{{if $notself}}
 
-			{{if $is_pending}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="pending-tool">
-					<h3>
-						<a data-bs-toggle="collapse" data-bs-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
-							{{$pending_label}}
-						</a>
-					</h3>
-				</div>
-				<div id="pending-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="pending-tool">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_checkbox.tpl" field=$unapproved}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
 			{{if ! $is_pending}}
 			<div id="template-form-vcard-org" class="mb-3 form-vcard-org">
 				<div class="mb-3 form-vcard-org">
@@ -438,85 +475,6 @@
 			<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
 			{{/if}}
 
-			{{if $rating}}
-			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="rating-tool">
-					<h3>
-						<a data-bs-toggle="collapse" data-bs-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
-							{{$lbl_rating}}
-						</a>
-					</h3>
-				</div>
-				<div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
-					<div class="section-content-tools-wrapper">
-						<div class="section-content-warning-wrapper">
-							{{$rating_info}}
-						</div>
-						<div class="mb-3"><strong>{{$lbl_rating_label}}</strong></div>
-						{{$rating}}
-						{{include file="field_textarea.tpl" field=$rating_text}}
-						<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			{{/if}}
-
-			{{/if}}
-
-			{{if ! $is_pending}}
-			<div class="panel">
-				{{if $notself}}
-				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-					<h3>
-						<a data-bs-toggle="collapse" data-bs-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-							{{$permlbl}}
-						</a>
-					</h3>
-				</div>
-				{{/if}}
-				<div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool">
-					<div class="section-content-tools-wrapper">
-						<div class="section-content-warning-wrapper">
-						{{if $notself}}{{$permnote}}{{/if}}
-						{{if $self}}{{$permnote_self}}{{/if}}
-						</div>
-
-						{{if $permcat_enable}}
-						<a href="permcats" class="float-end"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
-						{{include file="field_select.tpl" field=$permcat}}
-						{{/if}}
-
-						<table id="perms-tool-table" class=mb-3>
-							<tr>
-								<td></td>
-								{{if $notself}}
-								<td class="abook-them">{{$them}}</td>
-								{{/if}}
-								<td colspan="2" class="abook-me">{{$me}}</td>
-							</tr>
-							{{foreach $perms as $prm}}
-							{{include file="field_acheckbox.tpl" field=$prm}}
-							{{/foreach}}
-						</table>
-
-						{{if $self}}
-						<div>
-							<div class="section-content-info-wrapper">
-								{{$autolbl}}
-							</div>
-							{{include file="field_checkbox.tpl" field=$autoperms}}
-						</div>
-						{{/if}}
-
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
 			{{/if}}
 		</div>
 		</form>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6882c3b8a..fa942baff 100644
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -31,7 +31,7 @@
 
 	<h3>{{$registration}}</h3>
 	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select_grouped.tpl" field=$role}}
+	{{include file="field_select.tpl" field=$role}}
 	{{include file="field_select.tpl" field=$register_policy}}
 	{{** include file="field_checkbox.tpl" field=$register_wo_email **}}
 	{{include file="register_duty.tpl" field=$register_duty}}
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index e7ab559cb..5c1542111 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,23 +1,12 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper clearfix">
 		<div class="float-end">
-			{{if $contact.approve && $contact.ignore}}
-			<form action="connedit/{{$contact.id}}" method="post" >
-			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
-
-			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
-
-			{{/if}}
-			{{if $contact.connect}}
-				<a href="{{$contact.follow}}" class="btn btn-success btn-sm" title="{{$contact.connect_hover}}"><i class="fa fa-plus"></i> {{$contact.connect}}</a>
-			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm contact-delete-btn" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i> {{$contact.edit}}</a>
-			{{if $contact.approve}}
-			</form>
-			{{/if}}
+			<span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span>
+			<button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}">
+				<i class="fa fa-pencil"></i> {{$contact.edit}}
+			</button>
 		</div>
-		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
+		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o" title="{{$group_label}}"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
 	</div>
 	<div class="section-content-tools-wrapper">
 		<div class="contact-photo-wrapper" >
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 1719a6522..5fec38a84 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -1,7 +1,10 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper clearfix">
 		<div class="dropdown float-end">
-			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus();">
+			<button type="button" class="btn btn-success btn-sm" onclick="openClose('contacts-follow-form'); closeMenu('contacts-search-form'); $('#contacts-follow').focus();">
+				<i class="fa fa-plus"></i>&nbsp;Add
+			</button>
+			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); closeMenu('contacts-follow-form'); $('#contacts-search').focus();">
 				<i class="fa fa-search"></i>&nbsp;{{$label}}
 			</button>
 			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
@@ -16,10 +19,23 @@
 		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
 	</div>
 	<div id="contacts-search-form" class="section-content-tools-wrapper">
-		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
+		<form action="{{$cmd}}" method="get" name="contacts-search-form">
 			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
+				<button id="contacts-search-submit" class="btn btn-primary" type="submit"><i class="fa fa-fw fa-search"></i></button>
+			</div>
+		</form>
+	</div>
+	<div id="contacts-follow-form" class="section-content-tools-wrapper">
+		{{if $abook_usage_message}}
+		<div class="section-conten-info-wrapper">
+			{{$abook_usage_message}}
+		</div>
+		{{/if}}
+		<form action="follow" method="post">
+			<div class="input-group mb-3">
+				<input class="form-control" id="contacts-follow" type="text" name="url" title="Examples: bob@example.com, https://example.com/barbara" placeholder="Enter channel address">
+				<button class="btn btn-success" type="submit" name="submit" value="Connect" title="Connect"><i class="fa fa-fw fa-plus"></i></button>
 			</div>
 		</form>
 	</div>
@@ -34,3 +50,5 @@
 <div id="page-spinner" class="spinner-wrapper">
 	<div class="spinner m"></div>
 </div>
+{{include file="contact_edit_modal.tpl"}}
+
diff --git a/view/tpl/connstatus.tpl b/view/tpl/connstatus.tpl
index 869345682..30f450820 100644
--- a/view/tpl/connstatus.tpl
+++ b/view/tpl/connstatus.tpl
@@ -1 +1 @@
-<i class="fa fa-comments oneway-overlay text-{{if $perminfo.connpermcount == 3}}success{{elseif $perminfo.connpermcount > 0}}warning{{else}}danger{{/if}}" title="{{$perminfo.connperms}}"></i>
+<i class="fa fa-circle oneway-overlay text-{{if $perminfo.connpermcount == 3}}success{{elseif $perminfo.connpermcount > 0}}warning{{else}}danger{{/if}}" title="{{$perminfo.connperms}}"></i>
diff --git a/view/tpl/contact_edit.tpl b/view/tpl/contact_edit.tpl
new file mode 100644
index 000000000..3c4ed2ffe
--- /dev/null
+++ b/view/tpl/contact_edit.tpl
@@ -0,0 +1,133 @@
+<form id="contact-edit-form" action="contactedit/{{$contact_id}}" method="post" >
+	<div id="contact-edit-tools" class="panel-group"  role="tablist" >
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="roles-tool">
+				<h3>
+					<a class="section" data-bs-toggle="collapse" data-bs-target="#roles-tool-collapse" href="#" aria-expanded="true" aria-controls="roles-tool-collapse" data-section="roles">
+						Roles
+					</a>
+				</h3>
+			</div>
+			<div id="roles-tool-collapse" class="panel-collapse collapse{{if $section == 'roles'}} show{{/if}}" role="tabpanel" aria-labelledby="roles-tool" data-bs-parent="#contact-edit-tools">
+				<div class="section-content-tools-wrapper">
+					{{include file="field_select.tpl" field=$permcat}}
+					<button class="btn btn-outline-secondary btn-sm float-end sub_section{{if $sub_section == 'perms'}} sub_section_active{{/if}}" type="button" onclick="openClose('perms-table', 'table')" data-section="perms">
+						Compare permissions
+					</button>
+					<a href="permcats/{{$permcat_value}}" class="btn btn-sm btn-outline-primary">
+						<i class="fa fa-external-link"></i>&nbsp;{{$permcat_new}}
+					</a>
+					<table id="perms-table" class="table table-hover table-sm mt-3" style="display: {{if $sub_section == 'perms'}}table{{else}}none{{/if}};">
+						<thead>
+							<tr class="w-100">
+								<th scope="col">Permission</th>
+								<th scope="col">{{$them}}</th>
+								<th scope="col">{{$me}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{foreach $perms as $perm}}
+							<tr>
+								<td>{{$perm.1}}</td>
+								<td>
+									{{if $perm.2}}
+									<i class="fa fa-check text-success"></i>
+									{{else}}
+									<i class="fa fa-times text-danger"></i>
+									{{/if}}
+								</td>
+								<td>
+									{{if $perm.3}}
+									<i class="fa fa-check text-success"></i>
+									{{else}}
+									<i class="fa fa-times text-danger"></i>
+									{{/if}}
+								</td>
+							</tr>
+							{{/foreach}}
+
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		{{if $groups}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="group-tool">
+				<h3>
+					<a class="section" data-bs-toggle="collapse" data-bs-target="#group-tool-collapse" href="#" aria-expanded="true" aria-controls="group-tool-collapse" data-section="group">
+						Privacy groups
+					</a>
+				</h3>
+			</div>
+			<div id="group-tool-collapse" class="panel-collapse collapse{{if $section == 'group'}} show{{/if}}" role="tabpanel" aria-labelledby="group-tool" data-bs-parent="#contact-edit-tools">
+				<div class="section-content-tools-wrapper clearfix">
+					{{foreach $groups as $group}}
+					{{include file="field_checkbox.tpl" field=$group}}
+					{{/foreach}}
+					<a href="group/new" class="btn btn-sm btn-outline-primary">
+						<i class="fa fa-external-link"></i>&nbsp;Privacy groups
+					</a>
+				</div>
+			</div>
+		</div>
+		{{/if}}
+		{{if $multiprofs}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="profile-tool">
+				<h3>
+					<a class="section" data-bs-toggle="collapse" data-bs-target="#profile-tool-collapse" href="#" aria-expanded="true" aria-controls="profile-tool-collapse" data-section="profile">
+						Profiles
+					</a>
+				</h3>
+			</div>
+			<div id="profile-tool-collapse" class="panel-collapse collapse{{if $section == 'profile'}} show{{/if}}" role="tabpanel" aria-labelledby="profile-tool" data-bs-parent="#contact-edit-tools">
+				<div class="section-content-tools-wrapper">
+					{{$profile_select}}
+					<a href="profiles" class="btn btn-sm btn-outline-primary">
+						<i class="fa fa-external-link"></i>&nbsp;Profiles
+					</a>
+				</div>
+			</div>
+		</div>
+		{{/if}}
+		{{if $slide}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
+				<h3>
+					<a class="section" data-bs-toggle="collapse" data-bs-target="#affinity-tool-collapse" href="#" aria-expanded="true" aria-controls="affinity-tool-collapse" data-section="affinity">
+						Affinity
+					</a>
+				</h3>
+			</div>
+			<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool" data-bs-parent="#contact-edit-tools">
+				<div class="section-content-tools-wrapper">
+						<div class="mb-2"><label>{{$lbl_slider}}</label></div>
+						{{$slide}}
+						<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+				</div>
+			</div>
+		</div>
+		{{/if}}
+		{{if $connfilter}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="filter-tool">
+				<h3>
+					<a class="section"  data-bs-toggle="collapse" data-bs-target="#filter-tool-collapse" href="#" aria-expanded="true" aria-controls="filter-tool-collapse" data-section="filter">
+						Content filter
+					</a>
+				</h3>
+			</div>
+			<div id="filter-tool-collapse" class="panel-collapse collapse{{if $section == 'filter'}} show{{/if}}" role="tabpanel" aria-labelledby="filter-tool" data-bs-parent="#contact-edit-tools">
+				<div class="section-content-tools-wrapper">
+					{{include file="field_textarea.tpl" field=$incl}}
+					{{include file="field_textarea.tpl" field=$excl}}
+				</div>
+			</div>
+		</div>
+		{{else}}
+		<input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" />
+		<input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" />
+		{{/if}}
+	</div>
+</form>
diff --git a/view/tpl/contact_edit_header.tpl b/view/tpl/contact_edit_header.tpl
new file mode 100644
index 000000000..997d294bd
--- /dev/null
+++ b/view/tpl/contact_edit_header.tpl
@@ -0,0 +1,9 @@
+<div class="float-start me-2">
+	<a href="{{$href}}" title="{{$link_label}}" target="_blank">
+		<img src="{{$img_src}}" class="rounded" style="width: 3rem; height: 3rem;" />
+	</a>
+</div>
+<div class="m-1">
+	<div class="text-truncate h3 m-0"><strong>{{if $is_group}}<i class="fa fa-comments-o" title="{{$group_label}}"></i> {{/if}}{{$name}}</strong></div>
+	<div class="text-truncate text-muted">{{$addr}}</div>
+</div>
diff --git a/view/tpl/contact_edit_modal.tpl b/view/tpl/contact_edit_modal.tpl
new file mode 100644
index 000000000..be290c403
--- /dev/null
+++ b/view/tpl/contact_edit_modal.tpl
@@ -0,0 +1,152 @@
+<div id="edit-modal" class="modal" tabindex="-1">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<div id="edit-modal-title" class="modal-title w-75">
+					<div class="placeholder-wave">
+						<span class="placeholder placeholder-lg" style="width: 200px;"></span>
+					</div>
+				</div>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			</div>
+			<div id="edit-modal-body" class="modal-body">
+				<div class="placeholder-wave">
+					<span class="placeholder placeholder-lg w-100 mb-4"></span>
+					<span class="placeholder placeholder-lg w-100 mb-4"></span>
+					<span class="placeholder placeholder-lg w-100 mb-4"></span>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<div id="edit-modal-tools" class="me-auto"></div>
+				<button id="contact-save" type="button" class="btn btn-primary"></button>
+			</div>
+		</div>
+	</div>
+</div>
+<script>
+	let poi;
+	let section = 'roles';
+	let sub_section;
+
+
+	$('#edit-modal').on('hidden.bs.modal', function (e) {
+		if (window.location.hash) {
+			history.replaceState(null, '', 'connections');
+		}
+	})
+
+	if (window.location.hash) {
+		poi = window.location.hash.substr(1);
+		init_contact_edit(poi);
+	}
+
+	window.onhashchange = function() {
+		if (window.location.hash) {
+			poi = window.location.hash.substr(1);
+			init_contact_edit(poi);
+		}
+	};
+
+
+	$(document).on('click', '.contact-edit', function (e) {
+		e.preventDefault();
+		poi = this.dataset.id
+		init_contact_edit(poi);
+	});
+
+	$(document).on('click', '#contact-save', function () {
+		let form_data = $('#contact-edit-form').serialize() + '&section=' + section + '&sub_section=' + sub_section;
+
+		$.post('contactedit/' + poi, form_data, function(data) {
+			if (!data.success) {
+				$.jGrowl(data.message, {sticky: false, theme: 'notice', life: 10000});
+				return;
+			}
+			activate(data);
+			$.jGrowl(data.message, {sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: ((data.success) ? 3000 : 10000)});
+			// $('#edit-modal').modal('hide');
+		});
+
+	});
+
+	$(document).on('click', '.contact-tool', function (e) {
+		e.preventDefault();
+		let cmd = this.dataset.cmd;
+
+		$.get('contactedit/' + poi + '/' + cmd, function(data) {
+			$('#edit-modal-tools').html(data.tools);
+			$.jGrowl(data.message, {sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: ((data.success) ? 3000 : 10000)});
+			if (cmd === 'drop') {
+				if ($('#contact-entry-wrapper-' + poi).length) {
+					$('#contact-entry-wrapper-' + poi).fadeOut();
+				}
+				$('#edit-modal').modal('hide');
+			}
+		});
+	});
+
+	$(document).on('click', '.section', function () {
+		section = this.dataset.section;
+		sub_section = '';
+	});
+
+	$(document).on('click', '.sub_section', function () {
+		if ($(this).hasClass('sub_section_active')) {
+			$(this).removeClass('sub_section_active');
+			sub_section = '';
+		}
+		else {
+			$(this).addClass('sub_section_active');
+			sub_section = this.dataset.section;
+		}
+	});
+
+	function init_contact_edit(poi) {
+		if (!poi)
+			return
+		$.get('contactedit/' + poi, function(data) {
+			if (!data.success) {
+				$.jGrowl(data.message, {sticky: false, theme: 'notice', life: 10000});
+				return;
+			}
+			$('#edit-modal').modal('show');
+			activate(data);
+		});
+	}
+
+	function activate(data) {
+		$('#edit-modal-title').css('filter', 'blur(0px)');
+		$('#edit-modal-body').css('filter', 'blur(0px)');
+		$('#contact-save').removeClass('disabled');
+		$('#contact-tools').removeClass('disabled');
+
+		if (data.title) {
+			$('#edit-modal-title').html(data.title);
+		}
+
+		if (data.body) {
+			$('#edit-modal-body').html(data.body);
+		}
+
+		if (data.tools) {
+			$('#edit-modal-tools').html(data.tools);
+		}
+
+		if (data.submit) {
+			$('#contact-save').html(data.submit);
+		}
+
+		if (data.role && $('#contact-role-' + poi).length) {
+			$('#contact-role-' + poi).html(data.role);
+		}
+
+		if (data.pending) {
+			$('#contact-save').removeClass('btn-primary');
+			$('#contact-save').addClass('btn-success');
+		}
+		else {
+			$('#contact-save').addClass('btn-primary');
+			$('#contact-save').removeClass('btn-success');
+		}
+	}
+</script>
diff --git a/view/tpl/contact_edit_tools.tpl b/view/tpl/contact_edit_tools.tpl
new file mode 100644
index 000000000..565b9df86
--- /dev/null
+++ b/view/tpl/contact_edit_tools.tpl
@@ -0,0 +1,14 @@
+<button id="contact-tools" class="btn btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+	<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+</button>
+<div class="dropdown-menu">
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.refresh.title}}" data-cmd="refresh">{{$tools.refresh.label}}</a>
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.rephoto.title}}" data-cmd="resetphoto">{{$tools.rephoto.label}}</a>
+	<div class="dropdown-divider"></div>
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.block.title}}"  data-cmd="block">{{$tools.block.label}}</a>
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.ignore.title}}" data-cmd="ignore">{{$tools.ignore.label}}</a>
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.archive.title}}" data-cmd="archive">{{$tools.archive.label}}</a>
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.hide.title}}" data-cmd="hide">{{$tools.hide.label}}</a>
+	<div class="dropdown-divider"></div>
+	<a class="dropdown-item contact-tool" href="#" title="{{$tools.delete.title}}" data-cmd="drop">{{$tools.delete.label}}</a>
+</div>
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index c28bb732a..4237c671b 100644
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -18,3 +18,4 @@
 		</div><!-- /.modal-content -->
 	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
+{{include file="contact_edit_modal.tpl"}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 7c3505410..0a07319c8 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -40,7 +40,7 @@
 							<i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i>
 							<div class="dropdown-menu">
 								{{foreach $item.thread_author_menu as $mitem}}
-								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+								<a class="dropdown-item{{if $mitem.class}} {{$mitem.class}}{{/if}}" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}}{{if $mitem.data}} {{$mitem.data}}{{/if}}>{{$mitem.title}}</a>
 								{{/foreach}}
 							</div>
 							{{/if}}
@@ -48,7 +48,7 @@
 					</div>
 					{{if $item.lock}}
 					<div class="wall-item-lock dropdown">
-						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else if $item.locktype == 1}}fa-lock{{else}}fa-unlock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 					</div>
 					{{/if}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index a20a6de8d..b4071ba16 100644
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -43,7 +43,7 @@
 					</div>
 					{{if $item.lock}}
 					<div class="wall-item-lock dropdown">
-						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
+						<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else if $item.locktype == 1}}fa-lock{{else}}fa-unlock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 						<div id="panel-{{$item.id}}" class="dropdown-menu"></div>
 					</div>
 					{{/if}}
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
index 82c7be922..6729cf55c 100644
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
@@ -9,10 +9,10 @@
 			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
 		{{/if}}
 		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
+
 		{{include file="{{$item.template}}"}}
-		
-		
+
+
 	{{/foreach}}
 </div>
 {{/foreach}}
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 4c8b62f36..44f65fefd 100644
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,24 +1,31 @@
-<tr class="highlight">
+<tr>
 	<td>
-		<label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br>
-		<span class='field_abook_help'>{{$field.6}}</span>
+		<label class="mainlabel" for="me_id_{{$field.0}}">{{$field.1}}</label>
+		<span class="field_abook_help">{{$field.6}}</span>
 	</td>
-	{{if $notself}}
-	<td class="abook-them">
-		{{if $field.2 == 1}}<i class="fa fa-check-square-o"></i>{{/if}}
-		{{if $field.2 == 0}}<i class="fa fa-square-o"></i>{{/if}}
-	</td>
-	{{/if}}
-	<td class="abook-me">
-		{{if $self || !$field.5 }}
-		<input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
-		{{/if}}
-		{{if $notself && $field.5}}
-		<input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" />
-		{{if $field.3}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}}
+	<td>
+		{{if $field.5}}
+		<span class="text-nowrap text-danger">
+			{{$inherited}}
+			{{if $field.7}}
+			<i class="fa fa-check-square-o"></i>
+			{{else}}
+			<i class="fa fa-square-o"></i>
+			{{/if}}
+		</span>
 		{{/if}}
 	</td>
 	<td>
-		{{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="fa fa-check-square-o"></i>{{else}} <i class="fa fa-square-o"></i>{{/if}}{{/if}}</span>{{/if}}
+		{{if $is_system_role}}
+		{{if $field.3}}
+		<i class="fa fa-check-square-o"></i>
+		{{else}}
+		<i class="fa fa-square-o"></i>
+		{{/if}}
+		{{else}}
+		<input type="checkbox" name="{{$field.0}}" value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
+		{{/if}}
+
 	</td>
+
 </tr>
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
index a1ab42d5e..670bb7e29 100644
--- a/view/tpl/field_checkbox.tpl
+++ b/view/tpl/field_checkbox.tpl
@@ -1,6 +1,6 @@
 	<div id="{{$field.0}}_container" class="clearfix onoffswitch checkbox mb-3">
 		<label for="id_{{$field.0}}">{{$field.1}}{{if $field.6}}<sup class="required zuiqmid"> {{$field.6}}</sup>{{/if}}</label>
-		<div class="float-end"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
+		<div class="float-end"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
 		<small class="form-text text-muted">{{$field.3}}</small>
 	</div>
 {{*
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
index 5568179af..61203ab10 100644
--- a/view/tpl/group_edit.tpl
+++ b/view/tpl/group_edit.tpl
@@ -13,6 +13,8 @@
 			<input type='hidden' name='form_security_token' value='{{$form_security_token_edit}}'>
 			{{include file="field_input.tpl" field=$gname}}
 			{{include file="field_checkbox.tpl" field=$public}}
+			{{include file="field_checkbox.tpl" field=$is_default_acl}}
+			{{include file="field_checkbox.tpl" field=$is_default_group}}
 			{{$pgrp_extras}}
 			<a href="group/drop/{{$gid}}?t={{$form_security_token_drop}}" onclick="return confirmDelete();" class="btn btn-sm btn-danger">
 				{{$delete}}
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
index a91658464..7db80e06f 100644
--- a/view/tpl/group_selection.tpl
+++ b/view/tpl/group_selection.tpl
@@ -1,8 +1,8 @@
 <div class="mb-3 field custom">
-<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
-<select class="form-control" name="group-selection" id="group-selection" >
-{{foreach $groups as $group}}
-<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
-{{/foreach}}
-</select>
+	<label for="id_{{$form_id}}">{{$label}}</label>
+	<select class="form-control" name="{{$form_id}}" id="{{$form_id}}" >
+	{{foreach $groups as $group}}
+	<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
+	{{/foreach}}
+	</select>
 </div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 14f714ae9..979d20aa5 100644
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -13,9 +13,11 @@
 				<a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
 			</li>
 			{{/foreach}}
+			{{if $createtext}}
 			<li class="nav-item">
-				<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
+				<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-external-link"></i> {{$createtext}}</a>
 			</li>
+			{{/if}}
 		</ul>
 
 	</div>
diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl
index 058bfc14c..40a7967c5 100644
--- a/view/tpl/micropro_card.tpl
+++ b/view/tpl/micropro_card.tpl
@@ -1,5 +1,5 @@
 <a class="list-group-item{{if $class}} {{$class}}{{/if}} fakelink" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}>
-	<img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{if $perminfo}}{{include "connstatus.tpl"}}{{/if}}
+	<img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" loading="lazy" />{{if $perminfo}}{{include "connstatus.tpl"}}{{/if}}
 	<span class="contactname">{{$name}}</span>
 	<span class="dropdown-sub-text">{{$addr}}<br>{{$network}}</span>
 </a>
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 8d72df55b..f11a4291f 100644
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -18,17 +18,17 @@
 				{{if $default_role}}
 					<input type="hidden" name="permissions_role" value="{{$default_role}}" />
 				{{else}}
-					{{include file="field_select_grouped.tpl" field=$role}}
+					{{include file="field_select.tpl" field=$role}}
 				{{/if}}
-	
+
 				{{include file="field_input.tpl" field=$name}}
-	
+
 				{{include file="field_input.tpl" field=$nickname}}
 				<button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button>
-	
-	
+
+
 				<div id="newchannel-submit-end" class="clear"></div>
-	
+
 				<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
 				<div id="newchannel-import-end" class="clear"></div>
 			</form>
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 902691fae..24c3ec53c 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -8,7 +8,7 @@
 {{else}}
 <div id="personal-notes" class="widget{{if $hidden}} d-none{{/if}}">
 	<div class="float-end rounded border border-secondary mb-1 ps-1 pe-1 text-muted small note-mode" title="Double click note for edit mode">{{$strings.read}}</div>
-	<h3 class="float-start">{{$banner}}</h3>
+	<h3 class="float-start">{{$strings.title}}</h3>
 {{/if}}
 	<textarea name="note_text" id="note-text" class="form-control{{if $app}} border-0{{else}} p-1{{/if}}" style="display: none;">{{$text}}</textarea>
 	<div id="note-text-html" class="{{if !$app}}border rounded p-1{{/if}}">{{$html}}</div>
diff --git a/view/tpl/permcats.tpl b/view/tpl/permcats.tpl
index 5b2d811d7..279903048 100644
--- a/view/tpl/permcats.tpl
+++ b/view/tpl/permcats.tpl
@@ -4,49 +4,37 @@
 		<div class="clear"></div>
 	</div>
 	<div class="section-content-tools-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-
 		<form action="permcats" id="settings-permcats-form" method="post" autocomplete="off" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{include file="field_input.tpl" field=$name}}
+			<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+			<input type="hidden" name="return_path" value="{{$return_path}}">
 
-			<div class="settings-submit-wrapper mb-3">
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-	</div>
+			{{if $is_system_role}}
+			<input type="hidden" name="is_system_role" value="1">
+			<input type="hidden" name="name" value="{{$is_system_role}}">
+			{{/if}}
 
-	<div class="panel" id="permission-settings">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-bs-toggle="collapse" data-bs-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
+			{{include file="field_input.tpl" field=$name}}
+			{{include file="field_checkbox.tpl" field=$default_role}}
 
-				<table id="perms-tool-table" class=mb-3>
-					<tr>
-						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
+			{{$group_select}}
 
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
+			<div class="section-subtitle-wrapper" id="perms-tool">
+				<h3>
+					{{$permlbl}}
+				</h3>
 			</div>
-		</div>
-		{{if $permcats}}
-		<div class="section-content-wrapper-np">
+			<div class="section-content-warning-wrapper">
+			{{$permnote}}
+			</div>
+			<table id="" class="table table-hover">
+				{{foreach $perms as $prm}}
+				{{include file="field_acheckbox.tpl" field=$prm}}
+				{{/foreach}}
+			</table>
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+			{{**if $permcats}}
 			<table id="permcat-index">
 			{{foreach $permcats as $k => $v}}
 			<tr class="permcat-row-{{$k}}">
@@ -55,10 +43,8 @@
 			</tr>
 			{{/foreach}}
 			</table>
-		</div>
-		{{/if}}
+			{{/if**}}
 
+		</form>
 	</div>
-	</form>
-
 </div>
diff --git a/view/tpl/privacy_groups.tpl b/view/tpl/privacy_groups.tpl
index c06f5b0ca..0bbc998a1 100644
--- a/view/tpl/privacy_groups.tpl
+++ b/view/tpl/privacy_groups.tpl
@@ -8,6 +8,8 @@
 			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 			{{include file="field_input.tpl" field=$gname}}
 			{{include file="field_checkbox.tpl" field=$public}}
+			{{include file="field_checkbox.tpl" field=$is_default_acl}}
+			{{include file="field_checkbox.tpl" field=$is_default_group}}
 			{{$pgrp_extras}}
 			<button type="submit" name="submit" class="btn btn-sm btn-primary float-end">{{$submit}}</button>
 		</form>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 95346b3a8..3f5814c4a 100644
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -50,7 +50,7 @@
 					<div class="section-subtitle-wrapper" role="tab" id="personal">
 						<h3>
 							<a data-bs-toggle="collapse" data-bs-target="#personal-collapse" href="#" aria-expanded="true" aria-controls="personal-collapse">
-								{{$personal}}
+								{{$basic}}
 							</a>
 						</h3>
 					</div>
@@ -84,7 +84,17 @@
 							{{$dob}}
 							{{/if}}
 
+							{{$profile_in_dir}}
+
+							{{$suggestme}}
+
+							{{if $show_presence}}
+							{{include file="field_checkbox.tpl" field=$show_presence}}
+							{{/if}}
+
+							{{if $hide_friends}}
 							{{include file="field_checkbox.tpl" field=$hide_friends}}
+							{{/if}}
 
 							<div class="mb-3" >
 							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 8ebc9a311..9002d3742 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,5 +1,5 @@
-<div  class="rounded mb-3 vcard-card h-card">
-	<div  class="card">
+<div class="rounded mb-3 vcard-card h-card">
+	<div class="card mb-2">
 		<div class="row">
 			<div class="col-4" style="width: 7rem;">
 				{{if $editmenu}}
@@ -49,10 +49,10 @@
 	{{if $details}}
 	<div class="vcard ps-2 pe-2">
 		{{if $profile.pdesc}}
-		<div class="pb-3 pt-2">{{$profile.pdesc}}</div>
+		<div class="mb-2">{{$profile.pdesc}}</div>
 		{{/if}}
 		{{if $location}}
-		<dl class="">
+		<dl class="mb-0 pb-1">
 			<dt class="location-label">{{$location}}</dt>
 			<dd class="adr h-adr">
 				{{if $profile.address}}
@@ -72,25 +72,25 @@
 		</dl>
 		{{/if}}
 		{{if $hometown}}
-		<dl class="">
+		<dl class="mb-0 pb-1">
 			<dt class="hometown-label">{{$hometown}}</dt>
 			<dd class="p-hometown">{{$profile.hometown}}</dd>
 		</dl>
 		{{/if}}
 		{{if $gender}}
-		<dl class="">
+		<dl class="mb-0 pb-1">
 			<dt class="gender-label">{{$gender}}</dt>
 			<dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd>
 		</dl>
 		{{/if}}
 		{{if $marital}}
-		<dl class="">
+		<dl class="mb-0 pb-1">
 			<dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt>
 			<dd class="marital-text">{{$profile.marital}}</dd>
 		</dl>
 		{{/if}}
 		{{if $homepage}}
-		<dl class="pb-2">
+		<dl class="mb-0 pb-1">
 			<dt class="homepage-label">{{$homepage}}</dt>
 			<dd class="homepage-url u-url">{{$profile.homepage}}</dd>
 		</dl>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index ee89973a8..f3d0a8d03 100644
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -36,7 +36,7 @@
 				</div>
 				{{if $item.lock}}
 				<div class="wall-item-lock dropdown">
-					<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+					<i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else if $item.locktype == 1}}fa-lock{{else}}fa-unlock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i>&nbsp;
 				</div>
 				{{/if}}
 				<div class="wall-item-author">
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 353da9c2b..9b23d7d82 100644
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -18,13 +18,14 @@
 				</div>
 				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-bs-parent="#settings">
 					<div class="section-content-tools-wrapper">
-						{{include file="field_input.tpl" field=$username}}
+						{{include file="field_select.tpl" field=$role}}
 						{{include file="field_select_grouped.tpl" field=$timezone}}
 						{{include file="field_input.tpl" field=$defloc}}
 						{{include file="field_checkbox.tpl" field=$allowloc}}
 						{{include file="field_checkbox.tpl" field=$adult}}
 						{{include file="field_input.tpl" field=$photo_path}}
 						{{include file="field_input.tpl" field=$attach_path}}
+						{{include file="field_input.tpl" field=$expire}}
 						{{if $basic_addon}}
 						{{$basic_addon}}
 						{{/if}}
@@ -35,66 +36,6 @@
 				</div>
 			</div>
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
-					<h3>
-						<a data-bs-toggle="collapse" data-bs-target="#privacy-settings-collapse" href="#">
-							{{$h_prv}}
-						</a>
-					</h3>
-				</div>
-				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-bs-parent="#settings">
-					<div class="section-content-tools-wrapper">
-						{{include file="field_select_grouped.tpl" field=$role}}
-						{{$autoperms}}
-						<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
-							<div class="mb-3">
-								<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#apsModal">{{$lbl_p2macro}}</button>
-							</div>
-							<div class="modal" id="apsModal">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<h4 class="modal-title">{{$lbl_p2macro}}</h4>
-											<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-										</div>
-										<div class="modal-body">
-										{{foreach $permiss_arr as $permit}}
-											{{include file="field_select.tpl" field=$permit}}
-										{{/foreach}}
-										</div>
-										<div class="modal-footer">
-											<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal -->
-
-							<div id="settings-default-perms" class="mb-3" >
-								<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
-							</div>
-							{{$group_select}}
-							{{include file="field_checkbox.tpl" field=$hide_presence}}
-							{{$profile_in_dir}}
-						</div>
-						<div class="settings-common-perms">
-							{{$suggestme}}
-							{{include file="field_checkbox.tpl" field=$blocktags}}
-							{{include file="field_input.tpl" field=$expire}}
-						</div>
-						{{if $permcat_enable}}
-						{{include file="field_select.tpl" field=$defpermcat}}
-						{{/if}}
-
-						{{if $sec_addon}}
-						{{$sec_addon}}
-						{{/if}}
-						<div class="settings-submit-wrapper" >
-							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
 					<h3>
 						<a data-bs-toggle="collapse" data-bs-target="#notification-settings-collapse" href="#">
diff --git a/view/tpl/settings_privacy.tpl b/view/tpl/settings_privacy.tpl
new file mode 100644
index 000000000..aff9619c3
--- /dev/null
+++ b/view/tpl/settings_privacy.tpl
@@ -0,0 +1,56 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$ptitle}}</h2>
+	</div>
+	{{$nickname_block}}
+	<form action="settings/privacy" id="settings-form" method="post" autocomplete="off">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
+
+		<div class="section-content-tools-wrapper">
+
+			{{include file="field_checkbox.tpl" field=$autoperms}}
+			{{include file="field_checkbox.tpl" field=$index_opt_out}}
+
+			{{if $sec_addon}}
+			{{$sec_addon}}
+			{{/if}}
+			{{if $permission_limits}}
+			<div id="permission-limits">
+				<div class="modal" id="apsModal">
+					<div class="modal-dialog">
+						<div class="modal-content">
+							<div class="modal-header">
+								<div class="modal-title h3">{{$permission_limits_label}}</div>
+								<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+							</div>
+							<div class="modal-body">
+								<div class="multi-collapse collapse show">
+									<h2 class="text-danger mb-3"><i class="fa fa-warning"></i> {{$permission_limits_warning.0}}</h2>
+									<h3 class="mb-3">{{$permission_limits_warning.1}}</h3>
+									<button type="button" class="btn btn-primary"  data-bs-toggle="collapse" data-bs-target=".multi-collapse" aria-expanded="false" aria-controls="collapseExample">{{$permission_limits_warning.2}}</button>
+								</div>
+								<div class="multi-collapse collapse">
+								{{foreach $permiss_arr as $permit}}
+									{{include file="field_select.tpl" field=$permit}}
+								{{/foreach}}
+								{{include file="field_checkbox.tpl" field=$group_actor}}
+								</div>
+
+							</div>
+							<div class="modal-footer">
+								<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
+							</div>
+						</div><!-- /.modal-content -->
+					</div><!-- /.modal-dialog -->
+				</div><!-- /.modal -->
+			</div>
+			<div class="float-end">
+				<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#apsModal">{{$permission_limits_label}}</button>
+			</div>
+			{{/if}}
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+		</div>
+	</form>
+</div>