diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php
index 91967f5e..1cd9e9ab 100644
--- a/app/Presenters/ComponentGroupPresenter.php
+++ b/app/Presenters/ComponentGroupPresenter.php
@@ -105,8 +105,8 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable
      */
     public function has_subscriber($subscriptions)
     {
-	$enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray();
-	$intersected = array_intersect($enabled_components, $subscriptions);
+        $enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray();
+        $intersected = array_intersect($enabled_components, $subscriptions);
         return count($intersected) != 0;
     }
 
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 6511596e..4ac6dc4d 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -278,21 +278,17 @@ $(function() {
     });
 
     $('.select-group').on('click', function () {
-        var $this = $(this);
-        var $parentGroup = $this.closest('ul.list-group');
+        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();
+        event.stopPropagation();
         return false;
     });
 
     $('.deselect-group').on('click', function () {
-        var $this = $(this);
-        var $parentGroup = $this.closest('ul.list-group');
+        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();
diff --git a/resources/views/partials/component_input.blade.php b/resources/views/partials/component_input.blade.php
index abbc5f76..599d525e 100644
--- a/resources/views/partials/component_input.blade.php
+++ b/resources/views/partials/component_input.blade.php
@@ -1,18 +1,17 @@
 <li class="list-group-item {{ $component->group_id ? "sub-component" : "component" }}">
-                                            <div class="checkbox">
-                                                <label for="component-{{ $component->id }}">
-                                                <input type="checkbox"
-                                                         id="component-{{ $component->id }}"
-                                                       name="subscriptions[]"
-                                                      value="{{ $component->id }}"
-                                                @if (in_array($component->id, $subscriptions) || $subscriber->global)
-                                                    checked="checked"
-                                                @endif>
-                                                    {{ $component->name }}
-                                                </label>
-                                            </div>
-    @if($component->description)
+    <div class="checkbox">
+        <label for="component-{{ $component->id }}">
+            <input type="checkbox"
+                     id="component-{{ $component->id }}"
+                   name="subscriptions[]"
+                  value="{{ $component->id }}"
+            @if (in_array($component->id, $subscriptions) || $subscriber->global)
+                checked="checked"
+            @endif />
+          {{ $component->name }}
+      </label>
+  </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
-
+  @endif
 </li>
diff --git a/resources/views/partials/components_form.blade.php b/resources/views/partials/components_form.blade.php
index 5e31c33d..876891e2 100644
--- a/resources/views/partials/components_form.blade.php
+++ b/resources/views/partials/components_form.blade.php
@@ -1,33 +1,33 @@
 @if($component_groups->count() > 0)
-@foreach($component_groups as $componentGroup)
-<ul class="list-group components">
-    @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="#" class="select-group" id="select-all-{{$componentGroup->id}}">Select All</a>
-                &nbsp;|&nbsp;
-                <a href="#" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">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
+    @foreach($component_groups as $componentGroup)
+        <ul class="list-group components">
+            @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="#" class="select-group" id="select-all-{{$componentGroup->id}}">Select All</a>
+                        &nbsp;|&nbsp;
+                        <a href="#" class="deselect-group" id="deselect-all-{{$componentGroup->id}}">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
 @endif
 
 @if($ungrouped_components->count() > 0)
-<ul class="list-group components">
-    <li class="list-group-item group-name">
-        <strong>{{ trans('cachet.components.group.other') }}</strong>
-    </li>
-    @foreach($ungrouped_components as $component)
-    @include('partials.component_input', compact($component))
-    @endforeach
-</ul>
+    <ul class="list-group components">
+        <li class="list-group-item group-name">
+            <strong>{{ trans('cachet.components.group.other') }}</strong>
+        </li>
+        @foreach($ungrouped_components as $component)
+            @include('partials.component_input', compact($component))
+        @endforeach
+    </ul>
 @endif