diff --git a/templates/auth/css/main.scss b/templates/auth/css/main.scss
index 97ffbd0f..7c12b669 100644
--- a/templates/auth/css/main.scss
+++ b/templates/auth/css/main.scss
@@ -41,11 +41,10 @@ body {
 }
 
 .auth__logo {
-  width: 190px;
+  width: 160px;
   display: block;
-  margin: auto;
+  margin: 20px auto;
   position: relative;
-  transform: translate(0%, -40.9%);
 }
 
 .auth__secondary-action__banner {
diff --git a/templates/panel/sitekey/add/css/main.scss b/templates/panel/sitekey/add/css/main.scss
index 7c660869..02098f70 100644
--- a/templates/panel/sitekey/add/css/main.scss
+++ b/templates/panel/sitekey/add/css/main.scss
@@ -62,6 +62,7 @@
   width: $form-content-width;
   box-sizing: border-box;
   display: flex;
+  border: none;
 }
 
 .sitekey__level-title {
diff --git a/templates/panel/sitekey/add/existing-level.html b/templates/panel/sitekey/add/existing-level.html
index 0bd96ea5..62f0e5f3 100644
--- a/templates/panel/sitekey/add/existing-level.html
+++ b/templates/panel/sitekey/add/existing-level.html
@@ -7,7 +7,7 @@
     <input
       class="sitekey-form__level-input"
       type="number"
-      name=""
+      name="visitor<.= level .>"
       value=""
       id="visitor<.= level .>"
     />
@@ -17,7 +17,7 @@
     Difficulty
     <input
       type="number"
-      name="difficulty"
+      id="difficulty<.= level .>"
       class="sitekey-form__level-input"
       value=""
       id="difficulty<.= level .>"
@@ -29,7 +29,7 @@
       class="sitekey-form__level-add-level-button"
       type="button"
       name="remove"
-	  id="remove<.= level .>"
+      id="remove<.= level .>"
       value="Remove"
     />
   </label>
diff --git a/templates/panel/sitekey/add/ts/addLevelButton.test.ts b/templates/panel/sitekey/add/ts/addLevelButton.test.ts
new file mode 100644
index 00000000..1a108a2b
--- /dev/null
+++ b/templates/panel/sitekey/add/ts/addLevelButton.test.ts
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import getNumLevels from './levels/getNumLevels';
+import {getAddForm, addLevel} from './setupTests';
+
+document.body.innerHTML = getAddForm();
+
+it('addLevelButton works', () => {
+  expect(getNumLevels()).toBe(1);
+  // add a level
+  addLevel(2, 4);
+  expect(getNumLevels()).toBe(2);
+
+  // try to add duplicate level
+  addLevel(2, 4);
+  expect(getNumLevels()).toBe(2);
+
+  // try to add negative parameters
+  addLevel(-4, -9);
+  expect(getNumLevels()).toBe(2);
+
+  // add second level
+  addLevel(4, 9);
+  expect(getNumLevels()).toBe(3);
+
+  let a = document.body.innerHTML;
+
+  expect(trim(a)).toBe(trim(finalHtml()));
+});
+
+const trim = (s: string) => s.replace(/\s/g, '');
+
+const finalHtml = () => {
+  return `
+<form class="sitekey-form" action="/api/v1/mcaptcha/levels/add" method="post">
+  <h1 class="form__title">
+    Add Sitekey
+  </h1>
+  <label class="sitekey-form__label" for="description">
+    Description
+    <input
+      class="sitekey-form__input"
+      type="text"
+      name="description"
+      id="description"
+      required=""
+      value=""
+    >
+  </label>
+
+  <label class="sitekey-form__label" for="duration">
+    Cooldown Duratoin(in seconds)
+    <input
+      class="sitekey-form__input"
+      type="number"
+      name="duration"
+      id="duration"
+      min="0"
+      required=""
+      value="30"
+    >
+  </label>
+
+  <fieldset class="sitekey__level-container" id="level-group-1">
+    <legend class="sitekey__level-title">
+      Level 1
+    </legend>
+    <label class="sitekey-form__level-label" for="visitor1"
+      >Visitor
+      <input
+        class="sitekey-form__level-input"
+        type="number"
+        name="visitor1"
+        value=""
+        id="visitor1"
+      >
+    </label>
+
+    <label class="sitekey-form__level-label" for="difficulty1">
+      Difficulty
+      <input
+        type="number"
+        name="difficulty1"
+        class="sitekey-form__level-input"
+        value=""
+        id="difficulty1"
+      >
+    </label>
+    <label class="sitekey-form__level-label--hidden" for="remove-level1">
+      Remove Level
+      <input
+        class="sitekey-form__level-remove-level-button"
+        type="button"
+        name="remove-level1"
+        id="remove-level1"
+        value="x"
+      >
+    </label>
+  </fieldset>
+  <fieldset class="sitekey__level-container" id="level-group-2">
+    <legend class="sitekey__level-title">
+      Level 2
+    </legend>
+    <label class="sitekey-form__level-label" for="visitor2"
+      >Visitor
+      <input
+        class="sitekey-form__level-input"
+        type="number"
+        name="visitor2"
+        value=""
+        id="visitor2"
+      >
+    </label>
+
+    <label class="sitekey-form__level-label" for="difficulty2">
+      Difficulty
+      <input
+        type="number"
+        name="difficulty2"
+        class="sitekey-form__level-input"
+        value=""
+        id="difficulty2"
+      >
+    </label>
+    <label class="sitekey-form__level-label--hidden" for="remove-level2">
+      Remove Level
+      <input
+        class="sitekey-form__level-remove-level-button"
+        type="button"
+        name="remove-level2"
+        id="remove-level2"
+        value="x"
+      >
+    </label>
+  </fieldset>
+  <fieldset class="sitekey__level-container" id="level-group-3">
+    <legend class="sitekey__level-title">
+      Level 3
+    </legend>
+    <label class="sitekey-form__level-label" for="visitor3"
+      >Visitor
+      <input
+        class="sitekey-form__level-input"
+        type="number"
+        name="visitor3"
+        value=""
+        id="visitor3"
+      >
+    </label>
+
+    <label class="sitekey-form__level-label" for="difficulty3">
+      Difficulty
+      <input
+        type="number"
+        name="difficulty3"
+        class="sitekey-form__level-input"
+        value=""
+        id="difficulty3"
+      >
+    </label>
+    <label class="sitekey-form__level-label--hidden" for="add">
+      Add level
+      <input
+        class="sitekey-form__level-add-level-button"
+        type="button"
+        name="add"
+        id="add"
+        value="Add"
+      >
+    </label>
+  </fieldset>
+
+  <button class="sitekey-form__submit" type="submit">Submit</button>
+</form>
+  `;
+};
diff --git a/templates/panel/sitekey/add/ts/addLevelButton.ts b/templates/panel/sitekey/add/ts/addLevelButton.ts
index 958f9578..9b7eeafd 100644
--- a/templates/panel/sitekey/add/ts/addLevelButton.ts
+++ b/templates/panel/sitekey/add/ts/addLevelButton.ts
@@ -16,7 +16,6 @@
  */
 import validateLevel from './levels/validateLevel';
 import getNumLevels from './levels/getNumLevels';
-import  {LEVELS} from './levels/';
 import * as UpdateLevel from './levels/updateLevel';
 import {
   getRemoveButtonHTML,
@@ -82,7 +81,7 @@ const getHtml = (level: number) => {
     <input
       class="sitekey-form__level-input"
       type="number"
-      name=""
+      name="visitor${level}"
       value=""
       id="visitor${level}"
     />
@@ -92,7 +91,7 @@ const getHtml = (level: number) => {
     Difficulty
     <input
       type="number"
-      name="difficulty"
+      name="difficulty${level}"
       class="sitekey-form__level-input"
       value=""
       id="difficulty${level}"
diff --git a/templates/panel/sitekey/add/ts/form/validateDescription.test.ts b/templates/panel/sitekey/add/ts/form/validateDescription.test.ts
index 67356016..8bd39234 100644
--- a/templates/panel/sitekey/add/ts/form/validateDescription.test.ts
+++ b/templates/panel/sitekey/add/ts/form/validateDescription.test.ts
@@ -17,6 +17,9 @@
 
 import validateDescription from './validateDescription';
 import {getAddForm, fillDescription} from '../setupTests';
+import {mockAlert} from '../../../../../setUpTests';
+
+mockAlert();
 
 document.body.innerHTML = getAddForm();
 
diff --git a/templates/panel/sitekey/add/ts/levels/getNumLevels.ts b/templates/panel/sitekey/add/ts/levels/getNumLevels.ts
index 25fb2180..9fe69610 100644
--- a/templates/panel/sitekey/add/ts/levels/getNumLevels.ts
+++ b/templates/panel/sitekey/add/ts/levels/getNumLevels.ts
@@ -17,10 +17,6 @@
 
 import CONST from '../const';
 
-import {mockAlert} from '../../../../../setUpTests';
-
-mockAlert();
-
 /** returns number of level input fields currently in DOM */
 const getNumLevels = () => {
   let numLevels = 0;
diff --git a/templates/panel/sitekey/add/ts/setupTests.ts b/templates/panel/sitekey/add/ts/setupTests.ts
index cda0b547..53f69db9 100644
--- a/templates/panel/sitekey/add/ts/setupTests.ts
+++ b/templates/panel/sitekey/add/ts/setupTests.ts
@@ -132,7 +132,7 @@ export const getAddForm = () => `
       <input
         class="sitekey-form__level-input"
         type="number"
-        name=""
+        name="visitor1"
         value=""
         id="visitor1"
       />
@@ -142,7 +142,7 @@ export const getAddForm = () => `
       Difficulty
       <input
         type="number"
-        name="difficulty"
+        name="difficulty1"
         class="sitekey-form__level-input"
         value=""
         id="difficulty1"
diff --git a/tsconfig.json b/tsconfig.json
index e435d0dc..e585964a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,6 +36,7 @@
     "static",
     "docs",
     "jest.config.ts",
-    "**/*.test.ts"
+    "**/*.test.ts",
+    "tmp"
   ]
 }
diff --git a/webpack.config.js b/webpack.config.js
index b8b25b8c..96e9c193 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,8 +4,9 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 
 module.exports = {
-  devtool: 'inline-source-map',
-  mode: 'development',
+  //devtool: 'inline-source-map',
+  //mode: ''development,
+  mode: 'production',
   entry: './templates/index.ts',
   output: {
     filename: 'bundle.js',