diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index bd006f5b..fb6c5d87 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -93,20 +93,24 @@ return [
         'app-setup' => [
             'site-name'              => 'Site Name',
             'site-url'               => 'Site URL',
-            'site-timezone'          => 'Site Timezone',
-            'site-locale'            => 'Site Language',
-            'date-format'            => 'Date Format',
-            'incident-date-format'   => 'Incident Timestamp Format',
             'display-graphs'         => 'Display graphs on status page?',
             'about-this-page'        => 'About this page',
             'days-of-incidents'      => 'How many days of incidents to show?',
             'banner'                 => 'Banner Image',
             'banner-help'            => "It's recommended that you upload files no bigger than 930px wide .",
+            'subscribers'            => 'Allow people to signup to email notifications?',
+        ],
+        'analytics' => [
             'analytics_google'       => 'Google Analytics code',
             'analytics_gosquared'    => 'GoSquared Analytics code',
             'analytics_piwik_url'    => 'URL of your Piwik instance (without http(s)://)',
             'analytics_piwik_siteid' => 'Piwik\'s site id',
-            'subscribers'            => 'Allow people to signup to email notifications?',
+        ],
+        'localization' => [
+            'site-timezone'          => 'Site Timezone',
+            'site-locale'            => 'Site Language',
+            'date-format'            => 'Date Format',
+            'incident-date-format'   => 'Incident Timestamp Format',
         ],
         'security' => [
             'allowed-domains'      => 'Allowed domains',
diff --git a/resources/views/dashboard/settings/analytics.blade.php b/resources/views/dashboard/settings/analytics.blade.php
index e9d85228..72f2845c 100644
--- a/resources/views/dashboard/settings/analytics.blade.php
+++ b/resources/views/dashboard/settings/analytics.blade.php
@@ -8,7 +8,7 @@
         <div class="content-wrapper">
             <div class="header sub-header" id="application-setup">
                 <span class="uppercase">
-                    {{ trans('dashboard.settings.localization.localization') }}
+                    {{ trans('dashboard.settings.analytics.analytics') }}
                 </span>
             </div>
             <div class="row">
@@ -20,7 +20,7 @@
                             <div class="row">
                                 <div class="col-xs-12">
                                     <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.analytics_google') }}</label>
+                                        <label>{{ trans('forms.settings.analytics.analytics_google') }}</label>
                                         <input type="text" name="app_analytics" class="form-control" value="{{ Setting::get('app_analytics') }}" placeholder="UA-12345-12">
                                     </div>
                                 </div>
@@ -28,7 +28,7 @@
                             <div class="row">
                                 <div class="col-xs-12">
                                     <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.analytics_gosquared') }}</label>
+                                        <label>{{ trans('forms.settings.analytics.analytics_gosquared') }}</label>
                                         <input type="text" name="app_analytics_gs" class="form-control" value="{{ Setting::get('app_analytics_gs') }}" placeholder="GSN-12345-A">
                                     </div>
                                 </div>
@@ -36,7 +36,7 @@
                             <div class="row">
                                 <div class="col-xs-12">
                                     <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.analytics_piwik_url') }}</label>
+                                        <label>{{ trans('forms.settings.analytics.analytics_piwik_url') }}</label>
                                         <input type="text" name="app_analytics_pi_url" class="form-control" value="{{ Setting::get('app_analytics_pi_url') }}" placeholder="piwik.example.org">
                                     </div>
                                 </div>
@@ -44,7 +44,7 @@
                             <div class="row">
                                 <div class="col-xs-12">
                                     <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.analytics_piwik_siteid') }}</label>
+                                        <label>{{ trans('forms.settings.analytics.analytics_piwik_siteid') }}</label>
                                         <input type="number" min="1" max="100" name="app_analytics_pi_siteid" class="form-control" value="{{ Setting::get('app_analytics_pi_siteid') ?: 1 }}">
                                     </div>
                                 </div>
diff --git a/resources/views/dashboard/settings/localization.blade.php b/resources/views/dashboard/settings/localization.blade.php
index 2a99a6a7..a88b64fd 100644
--- a/resources/views/dashboard/settings/localization.blade.php
+++ b/resources/views/dashboard/settings/localization.blade.php
@@ -20,7 +20,7 @@
                             <div class="row">
                                 <div class="col-xs-12">
                                     <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.site-timezone') }}</label>
+                                        <label>{{ trans('forms.settings.localization.site-timezone') }}</label>
                                         <select name="app_timezone" class="form-control" required>
                                             <option value="">Select Timezone</option>
                                             @foreach($timezones as $region => $list)
@@ -40,7 +40,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>
-                                            {{ trans('forms.settings.app-setup.date-format') }}
+                                            {{ trans('forms.settings.localization.date-format') }}
                                             <a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="icon ion-help-circled"></i></a>
                                         </label>
                                         <input type="text" class="form-control" name="date_format" value="{{ Setting::get('date_format') ?: 'l jS F Y' }}">
@@ -51,7 +51,7 @@
                                 <div class="col-xs-12">
                                     <div class="form-group">
                                         <label>
-                                            {{ trans('forms.settings.app-setup.incident-date-format') }}
+                                            {{ trans('forms.settings.localization.incident-date-format') }}
                                             <a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="icon ion-help-circled"></i></a>
                                         </label>
                                         <input type="text" class="form-control" name="incident_date_format" value="{{ Setting::get('incident_date_format') ?: 'l jS F Y H:i:s' }}">
@@ -61,7 +61,7 @@
                             <div class="row">
                                 <div class="col-xs-12">
                                     <div class="form-group">
-                                        <label>{{ trans('forms.settings.app-setup.site-locale') }}</label>
+                                        <label>{{ trans('forms.settings.localization.site-locale') }}</label>
                                         <select name="app_locale" class="form-control" required>
                                             <option value="">Select Language</option>
                                             @foreach($langs as $lang => $name)