diff --git a/.all-contributorsrc b/.all-contributorsrc
new file mode 100644
index 00000000..186a9a02
--- /dev/null
+++ b/.all-contributorsrc
@@ -0,0 +1,10 @@
+{
+  "projectName": "TellForm",
+  "projectOwner": "tellform",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "contributors": []
+}
diff --git a/README.md b/README.md
index 5905b2ae..37335e03 100755
--- a/README.md
+++ b/README.md
@@ -203,6 +203,7 @@ Love our work and community? [Become a backer](https://opencollective.com/tellfo
 
 ## Contributors 
 
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section --><!-- ALL-CONTRIBUTORS-LIST:END -->
 [David Baldwynn](https://github.com/whitef0x0/)
 
 [Samuel Laulhau](https://github.com/lalop)
diff --git a/config/express.js b/config/express.js
index 66946fe3..e9cffe7a 100755
--- a/config/express.js
+++ b/config/express.js
@@ -218,11 +218,12 @@ module.exports = function(db) {
 	app.use(methodOverride());
 
 	// Use helmet to secure Express headers
-	app.use(helmet.xframe());
+	app.use(helmet.frameguard());
 	app.use(helmet.xssFilter());
-	app.use(helmet.nosniff());
-	app.use(helmet.ienoopen());
-	app.disable('x-powered-by');
+	app.use(helmet.noSniff());
+	app.use(helmet.ieNoOpen());
+	app.use(helmet.dnsPrefetchControl());
+	app.use(helmet.hidePoweredBy());
 
 
 	// Setting the app router and static folder
diff --git a/package.json b/package.json
index 7ef546ea..b7357a7d 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,8 @@
     "npm": "~2.11.2"
   },
   "scripts": {
+    "addcontrib": "all-contributors add",
+    "generate": "all-contributors generate",
     "start": "grunt",
     "test": "grunt test",
     "postinstall": "bower install --config.interactive=false; grunt build;",
@@ -62,7 +64,7 @@
     "grunt-ng-annotate": "~1.0.1",
     "grunt-node-inspector": "~0.4.1",
     "grunt-nodemon": "~0.4.0",
-    "helmet": "~0.14.0",
+    "helmet": "3.5.0",
     "inquirer": "^1.0.2",
     "jit-grunt": "^0.9.1",
     "lodash": "^2.4.1",
@@ -95,6 +97,7 @@
     "wildcard-subdomains": "github:whitef0x0/wildcard-subdomains"
   },
   "devDependencies": {
+    "all-contributors-cli": "^4.3.0",
     "chromedriver": "^2.25.1",
     "coveralls": "^2.11.4",
     "cross-spawn": "^5.0.0",
diff --git a/public/modules/forms/admin/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html
index f9cc6198..165faf31 100644
--- a/public/modules/forms/admin/views/admin-form.client.view.html
+++ b/public/modules/forms/admin/views/admin-form.client.view.html
@@ -96,8 +96,8 @@
 												<span ngclipboard data-clipboard-target="#copyEmbedded">
 													<textarea id="copyEmbedded" class="form-control ng-pristine ng-untouched ng-valid" style="min-height:200px; width:100%; background-color: #FFFFCC; color: #30313F;">
 														&lt;!-- Change the width and height values to suit you best --&gt;
-														<iframe id="iframe" src="https://{{actualFormURL}}" style="width:100%;height:500px;"></iframe>
-														<div style="font-family: Sans-Serif;font-size: 12px;color: #999;opacity: 0.5; padding-top: 5px;">Powered by<a href="https://www.tellform.com" style="color: #999" target="_blank">TellForm</a></div>
+														<iframe id="iframe" src="{{actualFormURL}}" style="width:100%;height:500px;"></iframe>
+														<div style="font-family: Sans-Serif;font-size: 12px;color: #999;opacity: 0.5; padding-top: 5px;">Powered by <a href="https://www.tellform.com" style="color: #999" target="_blank">TellForm</a></div>
 													</textarea>
 												</span>
 											</div>
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 cfd181ce..083bf2c4 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
@@ -19,7 +19,7 @@
 		</div>
 		<div class="col-xs-12 header-numbers">
 			<div class="col-xs-3">
-				{{myform.analytics.visitors}}
+				{{myform.analytics.visitors.length}}
 			</div>
 
 			<div class="col-xs-3">