diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index f09cdbf1fc..00d49b8a61 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -939,6 +939,18 @@ aside #follow-sidebar .form-group-search .form-button-search {
     padding: 2px 8px;
 }
 
+aside #group-sidebar .group-edit-tool {
+    opacity: 0.1;
+    transition: all 0.25s ease-in-out;
+}
+aside #group-sidebar .sidebar-group-li:hover .group-edit-tool {
+    opacity: 0.8;
+    transition: all 0.25s ease-in-out;
+}
+aside #group-sidebar .sidebar-group-li .group-edit-tool:hover {
+    opacity: 1;
+}
+
 /* contact block widget */
 #contact-block .contact-block-content {
     clear: both;
@@ -1637,7 +1649,7 @@ ul.dropdown-menu li:hover {
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
 .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
 .events-content-wrapper, .message-content-wrapper, .apps-content-wrapper, 
-.notifications-content-wrapper, .admin-content-wrapper {
+.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper {
     min-height: calc(100vh - 150px);
     padding: 15px;
     padding-bottom: 20px;
diff --git a/view/theme/frio/templates/follow.tpl b/view/theme/frio/templates/follow.tpl
index 8100f853e8..a35bcb2131 100644
--- a/view/theme/frio/templates/follow.tpl
+++ b/view/theme/frio/templates/follow.tpl
@@ -1,8 +1,10 @@
 
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
-	<div id="connect-desc">{{$desc}}</div>
+
+	<div id="connect-desc">{{$desc}}</div> {{* The description *}}
 	<form action="follow" method="get" >
+		{{* The input field - For visual consistence we are using a search input field*}}
 		<div class="form-group form-group-search">
 			<input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value|escape:'html'}}" placeholder="{{$hint|escape:'html'}}" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
 			<button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$follow|escape:'html'}}">{{$follow}}</button>
diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
new file mode 100644
index 0000000000..682da5e118
--- /dev/null
+++ b/view/theme/frio/templates/group_side.tpl
@@ -0,0 +1,49 @@
+<div class="widget" id="group-sidebar">
+	<h3>{{$title}}</h3>
+
+	<div id="sidebar-group-list">
+		{{* The list of available groups *}}
+		<ul role="menu" id="sidebar-group-ul">
+			{{foreach $groups as $group}}
+				<li role="menuitem" class="sidebar-group-li group-{{$group.id}} {{if $group.selected}}selected{{/if}}">
+					{{if ! $newgroup}}<span class="notify badge pull-right"></span>{{/if}}
+					{{if $group.cid}}
+						<div class="checkbox pull-right group-checkbox ">
+							<input type="checkbox"
+								class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
+								onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+								{{if $group.ismember}}checked="checked"{{/if}}
+							/>
+							<label for="group-{{$group.id}}"></label>
+							<div class="clearfix"></div>
+						</div>
+					{{/if}}
+					{{if $group.edit}}
+						{{* if the group is editable show a little pencil for editing *}}
+						<a id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-tool pull-right" href="{{$group.edit.href}}" title="{{$edittext}}">
+							<i class="faded-icon fa fa-pencil" aria-hidden="true"></i><span class="sr-only">{{$edittext}}</span>
+						</a>
+					{{/if}}
+					<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element" href="{{$group.href}}">{{$group.text}}</a>
+				</li>
+			{{/foreach}}
+		</ul>
+	</div>
+
+	{{if $newgroup}}
+	<div id="sidebar-new-group">
+		{{* show the input field by clicking "new group" *}}
+		<a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
+		<form id="group-new-form" action="group/new" method="post" style="display:none;">
+			<div class="form-group">
+				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+				<input name="groupname" id="id_groupname" class="form-control input-sm" placeholder="{{$creategroup}}">
+			</div>
+		</form>
+	</div>
+	{{else}}
+	<div id="sidebar-edit-groups"><a href="{{$grouppage}}">{{$editgroupstext}}</a></div>
+	{{/if}}
+
+	{{if $ungrouped}}<div id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></div>{{/if}}
+</div>
diff --git a/view/theme/frio/templates/peoplefind.tpl b/view/theme/frio/templates/peoplefind.tpl
index 941fd1a4d3..6b31c92ada 100644
--- a/view/theme/frio/templates/peoplefind.tpl
+++ b/view/theme/frio/templates/peoplefind.tpl
@@ -1,13 +1,18 @@
 
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
-	<div id="peoplefind-desc">{{$desc}}</div>
+
+	<div id="peoplefind-desc">{{$desc}}</div> {{* The description *}}
+
 	<form action="dirfind" method="get" />
+		{{* The search field *}}
 		<div class="form-group form-group-search">
 			<input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
 			<button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit" name="submit" value="{{$findthem|escape:'html'}}">{{$findthem}}</button>
 		</div>
 	</form>
+
+	{{* Additional links *}}
 	<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
 	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>