diff --git a/resources/assets/js/cachet.js b/resources/assets/js/cachet.js
index f17e0d22..37871349 100644
--- a/resources/assets/js/cachet.js
+++ b/resources/assets/js/cachet.js
@@ -216,7 +216,9 @@ $(function () {
         $('input[name=remove_banner]').val('1');
     });
 
-    $('.group-name').on('click', function () {
+    $('.group-name').on('click', function (event) {
+        event.stopPropagation();
+
         var $this = $(this);
 
         $this.find('.group-toggle').toggleClass('ion-ios-minus-outline').toggleClass('ion-ios-plus-outline');
@@ -224,20 +226,16 @@ $(function () {
         $this.next('.group-items').toggleClass('hide');
     });
 
-    $('.select-group').on('click', function () {
+    $('.select-group').on('click', function (event) {
         var $parentGroup = $(this).closest('ul.list-group');
         $parentGroup.find('input[type=checkbox]').prop('checked', true);
-        $parentGroup.find('.group-items').removeClass('hide')
-        $parentGroup.find('.group-toggle').addClass('ion-ios-minus-outline').removeClass('ion-ios-plus-outline');
         event.stopPropagation();
         return false;
     });
 
-    $('.deselect-group').on('click', function () {
+    $('.deselect-group').on('click', function (event) {
         var $parentGroup = $(this).closest('ul.list-group');
         $parentGroup.find('input[type=checkbox]').prop('checked', false);
-        $parentGroup.find('.group-items').addClass('hide');
-        $parentGroup.find('.group-toggle').removeClass('ion-ios-minus-outline').addClass('ion-ios-plus-outline');
         event.stopPropagation();
         return false;
     });
diff --git a/resources/views/subscribe/manage.blade.php b/resources/views/subscribe/manage.blade.php
index 472d0fe1..1e14808c 100644
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -20,29 +20,36 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             @if($componentGroups->isNotEmpty() || $ungroupedComponents->isNotEmpty())
             @foreach($componentGroups as $componentGroup)
-            <div class="list-group components">
-                @if($componentGroup->enabled_components->count() > 0)
+            <ul class="list-group">
+                @if($componentGroup->enabled_components()->count() > 0)
+                    <li class="list-group-item group-name">
+                        <i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
+                        <strong>{{ $componentGroup->name }}</strong>
+                        <div class="pull-right text-muted small">
+                            <a href="javascript: void(0);" class="select-group" id="select-all-{{$componentGroup->id}}">{{ trans('cachet.components.select_all') }}</a>
+                            &nbsp;|&nbsp;
+                            <a href="javascript: void(0);" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">{{ trans('cachet.components.deselect_all') }}</a>
+                        </div>
+                    </li>
+                    <div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}">
+                        @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
+                        @include('partials.component_input', compact($component))
+                        @endforeach
+                    </div>
+                @endif
+            </ul>
+            @endforeach
+
+            @if($ungroupedComponents->isNotEmpty())
+            <ul class="list-group">
                 <div class="list-group-item group-name">
-                    <i class="{{ $componentGroup->collapse_class_with_subscriptions($subscriptions) }} group-toggle"></i>
-                    <strong>{{ $componentGroup->name }}</strong>
+                    <strong>{{ trans('cachet.components.group.other') }}</strong>
                     <div class="pull-right text-muted small">
                         <a href="javascript: void(0);" class="select-group" id="select-all-{{$componentGroup->id}}">{{ trans('cachet.components.select_all') }}</a>
                         &nbsp;|&nbsp;
                         <a href="javascript: void(0);" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">{{ trans('cachet.components.deselect_all') }}</a>
                     </div>
                 </div>
-                @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
-                @include('partials.component_input', compact($component))
-                @endforeach
-                @endif
-            </div>
-            @endforeach
-
-            @if($ungroupedComponents->isNotEmpty())
-            <ul class="list-group components">
-                <div class="list-group-item group-name">
-                    <strong>{{ trans('cachet.components.group.other') }}</strong>
-                </div>
                 @foreach($ungroupedComponents as $component)
                 @include('partials.component_input', compact($component))
                 @endforeach