diff --git a/resources/views/partials/component_input.blade.php b/resources/views/partials/component_input.blade.php
index a70c77b3..628f2288 100644
--- a/resources/views/partials/component_input.blade.php
+++ b/resources/views/partials/component_input.blade.php
@@ -10,8 +10,8 @@
             @endif />
           {{ $component->name }}
         </label>
+        @if($component->description)
+        <i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i>
+        @endif
     </div>
-    @if($component->description)
-    <i class="ion ion-ios-help-outline help-icon" data-toggle="tooltip" data-title="{{ $component->description }}" data-container="body"></i>
-    @endif
 </li>
diff --git a/resources/views/subscribe/manage.blade.php b/resources/views/subscribe/manage.blade.php
index 62d33ba8..7492664d 100644
--- a/resources/views/subscribe/manage.blade.php
+++ b/resources/views/subscribe/manage.blade.php
@@ -14,37 +14,31 @@
     <div class="col-xs-12 col-lg-offset-2 col-lg-8">
         <div class="text-center margin-bottom">
             <h1>{{ $app_name }} Notifications</h1>
-            <p>
-                Manage notifications for {{ $subscriber->email }}
-            </p>
+            <p>Manage notifications for <strong>{{ $subscriber->email }}</strong></p>
         </div>
         <form action="{{ cachet_route('subscribe.manage', [$subscriber->verify_code], 'post') }}" method="post">
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
-            @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
-            @if($component_groups->count() > 0)
+            @if($component_groups->isNotEmpty() || $ungrouped_components->isNotEmpty())
             @foreach($component_groups as $componentGroup)
             <div class="list-group components">
                 @if($componentGroup->enabled_components->count() > 0)
-                    <div 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}}">Select All</a>
-                            &nbsp;|&nbsp;
-                            <a href="javascript: void(0);" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">Deselect All</a>
-                        </div>
-                    </div>
-                    <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 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}}">Select All</a>
+                        &nbsp;|&nbsp;
+                        <a href="javascript: void(0);" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">Deselect All</a>
                     </div>
+                </div>
+                @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component)
+                @include('partials.component_input', compact($component))
+                @endforeach
                 @endif
             </div>
             @endforeach
-            @endif
 
-            @if($ungrouped_components->count() > 0)
+            @if($ungrouped_components->isNotEmpty())
             <ul class="list-group components">
                 <div class="list-group-item group-name">
                     <strong>{{ trans('cachet.components.group.other') }}</strong>