diff --git a/.gitignore b/.gitignore
index e5751f4..625b55c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-extension.pem
-extension.crx
+**/key.pem
+**/extension.crx
+**/extension.zip
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 05b85d1..c9623ed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -16,11 +16,11 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="manifest.json" pinned="false" current-in-tab="true">
+      <file leaf-file-name="manifest.json" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/extension/manifest.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="375">
-              <caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
+            <state relative-caret-position="390">
+              <caret line="26" column="1" lean-forward="true" selection-start-line="26" selection-start-column="1" selection-end-line="26" selection-end-column="1" />
               <folding />
             </state>
           </provider>
@@ -29,8 +29,8 @@
       <file leaf-file-name="popup.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/extension/src/popup.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1052">
-              <caret line="114" column="65" lean-forward="false" selection-start-line="114" selection-start-column="65" selection-end-line="114" selection-end-column="65" />
+            <state relative-caret-position="962">
+              <caret line="105" column="58" lean-forward="true" selection-start-line="105" selection-start-column="58" selection-end-line="106" selection-end-column="45" />
               <folding>
                 <element signature="n#!!doc" expanded="true" />
               </folding>
@@ -38,11 +38,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="content.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="content.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/extension/src/content.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="675">
-              <caret line="45" column="28" lean-forward="true" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
+            <state relative-caret-position="180">
+              <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
               <folding />
             </state>
           </provider>
@@ -95,8 +95,9 @@
         <option value="$PROJECT_DIR$/src/manifest.json" />
         <option value="$PROJECT_DIR$/src/popup.js" />
         <option value="$PROJECT_DIR$/src/content.js" />
-        <option value="$PROJECT_DIR$/extension/src/popup.js" />
         <option value="$PROJECT_DIR$/extension/manifest.json" />
+        <option value="$PROJECT_DIR$/extension/src/popup.js" />
+        <option value="$PROJECT_DIR$/extension/src/content.js" />
       </list>
     </option>
   </component>
@@ -117,9 +118,9 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="33" />
+    <option name="x" value="9" />
     <option name="y" value="23" />
-    <option name="width" value="1755" />
+    <option name="width" value="1589" />
     <option name="height" value="1352" />
   </component>
   <component name="ProjectView">
@@ -242,11 +243,11 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/extension/images" />
       <recent name="$PROJECT_DIR$/extension/src" />
       <recent name="$PROJECT_DIR$/extension/lib" />
       <recent name="$PROJECT_DIR$/extension" />
-      <recent name="$PROJECT_DIR$/src" />
     </key>
   </component>
   <component name="RunManager">
@@ -857,16 +858,16 @@
       <option name="presentableId" value="Default" />
       <updated>1482856198260</updated>
       <workItem from="1482856199839" duration="12305000" />
-      <workItem from="1482892579391" duration="2340000" />
+      <workItem from="1482892579391" duration="6291000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14645000" />
+    <option name="totallyTimeSpent" value="18596000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="33" y="23" width="1755" height="1352" extended-state="0" />
-    <editor active="false" />
+    <frame x="9" y="23" width="1589" height="1352" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -882,7 +883,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25218913" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27925017" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -931,10 +932,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/extension/manifest.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="26" column="1" lean-forward="true" selection-start-line="26" selection-start-column="1" selection-end-line="26" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/extension/src/popup.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1052">
-          <caret line="114" column="65" lean-forward="false" selection-start-line="114" selection-start-column="65" selection-end-line="114" selection-end-column="65" />
+        <state relative-caret-position="962">
+          <caret line="105" column="58" lean-forward="true" selection-start-line="105" selection-start-column="58" selection-end-line="106" selection-end-column="45" />
           <folding>
             <element signature="n#!!doc" expanded="true" />
           </folding>
@@ -943,16 +952,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/extension/src/content.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="45" column="28" lean-forward="true" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/extension/manifest.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="1" lean-forward="true" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
+        <state relative-caret-position="180">
+          <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
           <folding />
         </state>
       </provider>
diff --git a/extension/manifest.json b/extension/manifest.json
index 42eb85c..6b8e7b8 100644
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -2,6 +2,7 @@
   "manifest_version": 2,
 
   "name": "Credit Card Nicknames for Amazon",
+  "short_name" :"CCNA",
   "description": "This extension allows you to assign nick names to your credit cards on Amazon.com (US Only).",
   "version": "1.0",
   "icons": {
diff --git a/extension/src/content.js b/extension/src/content.js
index 0d84e72..851fce3 100644
--- a/extension/src/content.js
+++ b/extension/src/content.js
@@ -10,7 +10,8 @@ function updateNicknames() {
         function appendNickname() {
             const ccnum = CryptoJS.SHA256($(this).text().match(regex)[1]);
             if(nicknames[ccnum] != undefined) {
-                $(this).append("<span class='cc_nickname'> - "+nicknames[ccnum]+"</span>");
+                const node = $("<span class='cc_nickname'></span>").text(" - "+nicknames[ccnum]);
+                $(this).append(node);
             }
         }
 
diff --git a/extension/src/popup.js b/extension/src/popup.js
index 96ce8d4..b41fa22 100644
--- a/extension/src/popup.js
+++ b/extension/src/popup.js
@@ -63,7 +63,8 @@ chrome.runtime.onMessage.addListener(function(request, sender) {
                 request.numbers.forEach((item) => {
                     const ccHash = CryptoJS.SHA256(item);
                     const oldValue = (nicknames[ccHash] != undefined) ? nicknames[ccHash] : "";
-                    const input = $("<input type='text' id='card"+ccHash+"' value='"+oldValue+"' placeholder='Nickname'/>");
+                    const input = $("<input type='text' id='card"+ccHash+"' placeholder='Nickname'/>");
+                    input.val(oldValue);
                     let node = $("<div><span>"+item+"</span> </div>").append(input);
                     input.change(()=>{
                         nicknames[ccHash] = input.val();