diff --git a/resources/views/partials/analytics.blade.php b/resources/views/partials/analytics.blade.php
index 5287c3e4..67281fae 100644
--- a/resources/views/partials/analytics.blade.php
+++ b/resources/views/partials/analytics.blade.php
@@ -1,35 +1,35 @@
 @if($enable_external_dependencies)
 @if($app_analytics)
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  ga('create', '{{ $app_analytics }}', '{{ $_SERVER['SERVER_NAME'] or '' }}');
-  ga('send', 'pageview');
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    ga('create', '{{ $app_analytics }}', '{{ $_SERVER['SERVER_NAME'] or '' }}');
+    ga('send', 'pageview');
 </script>
 @endif
 @if($app_analytics_go_squared)
 <script>
-  !function(g,s,q,r,d){r=g[r]=g[r]||function(){(r.q=r.q||[]).push(
-  arguments)};d=s.createElement(q);q=s.getElementsByTagName(q)[0];
-  d.src='https://d1l6p2sc9645hc.cloudfront.net/tracker.js';q.parentNode.
-  insertBefore(d,q)}(window,document,'script','_gs');
-  _gs('{{ $app_analytics_go_squared }}');
+    !function(g,s,q,r,d){r=g[r]=g[r]||function(){(r.q=r.q||[]).push(
+    arguments)};d=s.createElement(q);q=s.getElementsByTagName(q)[0];
+    d.src='https://d1l6p2sc9645hc.cloudfront.net/tracker.js';q.parentNode.
+    insertBefore(d,q)}(window,document,'script','_gs');
+    _gs('{{ $app_analytics_go_squared }}');
 </script>
 @endif
 @if($app_analytics_piwik_url)
 <script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://{{ $app_analytics_piwik_url }}";
-    _paq.push(['setTrackerUrl', u+'/piwik.php']);
-    _paq.push(['setSiteId', {{ $app_analytics_piwik_site_id }}]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'/piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
+    var _paq = _paq || [];
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+        var u="https://{{ $app_analytics_piwik_url }}";
+        _paq.push(['setTrackerUrl', u+'/piwik.php']);
+        _paq.push(['setSiteId', {{ $app_analytics_piwik_site_id }}]);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'/piwik.js'; s.parentNode.insertBefore(g,s);
+    })();
 </script>
 <noscript><p><img src="https://{{ $app_analytics_piwik_url }}/piwik.php?idsite={{ $app_analytics_piwik_site_id }}" style="border:0;" alt="" /></p></noscript>
 @endif
diff --git a/resources/views/partials/component_input.blade.php b/resources/views/partials/component_input.blade.php
index 599d525e..a70c77b3 100644
--- a/resources/views/partials/component_input.blade.php
+++ b/resources/views/partials/component_input.blade.php
@@ -9,9 +9,9 @@
                 checked="checked"
             @endif />
           {{ $component->name }}
-      </label>
-  </div>
-  @if($component->description)
+        </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.blade.php b/resources/views/partials/components.blade.php
index 76a2d6cf..2a06ff47 100644
--- a/resources/views/partials/components.blade.php
+++ b/resources/views/partials/components.blade.php
@@ -23,9 +23,7 @@
 
 @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>
+    <li class="list-group-item group-name"><strong>{{ trans('cachet.components.group.other') }}</strong></li>
     @foreach($ungrouped_components as $component)
     @include('partials.component', compact($component))
     @endforeach
diff --git a/resources/views/partials/components_form.blade.php b/resources/views/partials/components_form.blade.php
index 2c260d70..4aea735d 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