diff --git a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
index b5c111b2..7bc5008c 100644
--- a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
+++ b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
@@ -78,7 +78,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                         var data = response.data || [];
 
                         $scope.analyticsData = data[0];
-                        $scope.analyticsData.globalStatistics = $scope.analyticsData.globalStatistics[0];
+                        $scope.analyticsData.globalStatistics = formatGlobalStatistics($scope.analyticsData.globalStatistics);
                         $scope.analyticsData.deviceStatistics = formatDeviceStatistics($scope.analyticsData.deviceStatistics);
                     });
                 };
@@ -104,6 +104,19 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                 /*
                 ** Analytics Functions
                 */
+                var formatGlobalStatistics = function(globalStatData){
+                    if(!globalStatData.length){
+                        return {
+                            visits: 0,
+                            responses: 0,
+                            conversion_rate: 0,
+                            average_time: 0
+                        };
+                    } 
+                    return globalStatData[0];
+                }
+                        
+
                 var formatDeviceStatistics = function(deviceStatData){
                     var newStatItem = function(){
                         return {
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
index 456abe1d..393975be 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
@@ -1,4 +1,4 @@
-<div class="submissions-table row">
+<div class="submissions-table container-fluid">
 	<div class="row text-center analytics" ng-if="analyticsData">
 		<div class="col-xs-12 header-title">
 			<div class="col-xs-3">