diff --git a/Gulpfile.js b/Gulpfile.js
index 3951d84..3778879 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -46,9 +46,11 @@ gulp.task('dist', ['tmp'], function () {
     '!tmp/index.html',
     '!tmp/content_script_web.js'
   ], {base: 'tmp'});
+  var imageAssets = gulp.src('src/*.png').pipe($.flatten());
   var chromePluginResources = gulp.src([
     'src/content_script.js',
-    'manifest.json'
+    'src/background.js',
+    'src/manifest.json',
   ])
   .pipe($.flatten())
   .pipe($.fileInclude({
@@ -56,13 +58,14 @@ gulp.task('dist', ['tmp'], function () {
     basePath: '@file'
   }));
 
-  return $.merge([tmp, chromePluginResources])
+  return $.merge([tmp, chromePluginResources, imageAssets])
   .pipe(gulp.dest('dist'));
 });
 
 gulp.task('dist-node-modules', function () {
   return gulp.src([
     'node_modules/bootstrap/**/*',
+    'node_modules/material-design-lite/**/*',
     'node_modules/angular/**/*',
     'node_modules/jquery/**/*'
     ], {base: 'node_modules'})
@@ -73,6 +76,10 @@ gulp.task('clean', function () {
   return $.del(['tmp', 'dist']);
 });
 
+gulp.task('watch-plugin', ['dist'], function () {
+  gulp.watch("src/**/*", ['dist']);
+});
+
 gulp.task('serve', ['tmp'], function () {
   // Serve files from the root of this project
   browserSync.init({
diff --git a/package.json b/package.json
index 8bd0def..5f8c532 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "gulp-ng-annotate": "^1.1.0",
     "gulp-typescript": "^2.9.2",
     "jquery": "^2.1.4",
+    "material-design-lite": "^1.0.5",
     "merge2": "^0.3.6"
   }
 }
diff --git a/background.js b/src/background.js
similarity index 94%
rename from background.js
rename to src/background.js
index 5acd4a7..fd2588d 100644
--- a/background.js
+++ b/src/background.js
@@ -16,5 +16,5 @@ function initBackground () {
   updateIcon();
 }
 
-initBackground();
+// initBackground();
 
diff --git a/src/icon1.png b/src/icon1.png
deleted file mode 100644
index ea42f3f..0000000
Binary files a/src/icon1.png and /dev/null differ
diff --git a/src/icon128.png b/src/icon128.png
new file mode 100644
index 0000000..c079a13
Binary files /dev/null and b/src/icon128.png differ
diff --git a/src/icon16.png b/src/icon16.png
new file mode 100644
index 0000000..e277cba
Binary files /dev/null and b/src/icon16.png differ
diff --git a/src/icon2.png b/src/icon2.png
deleted file mode 100644
index da75c5f..0000000
Binary files a/src/icon2.png and /dev/null differ
diff --git a/src/icon48.png b/src/icon48.png
new file mode 100644
index 0000000..27a8bf3
Binary files /dev/null and b/src/icon48.png differ
diff --git a/manifest.json b/src/manifest.json
similarity index 54%
rename from manifest.json
rename to src/manifest.json
index 4422da2..fb3d66c 100644
--- a/manifest.json
+++ b/src/manifest.json
@@ -2,24 +2,28 @@
   "name": "Tag you're it",
   "description": "Make the meaning clear. This plugin enables semantic tagging of web content.",
   "version": "0.7",
+  "manifest_version": 2,
+  "icons": {
+    "16": "icon16.png",
+    "48": "icon48.png",
+    "128": "icon128.png"
+  },
+  "permissions": ["storage"],
   "background": {
     "persistent": false,
     "scripts": ["background.js"]
   },
   "web_accessible_resources": [
-    "**/*.html"
+    "**/*.html",
+    "**/*.js"
   ],
   "content_scripts": [{
     "matches": ["<all_urls>"],
-    "css": ["bower_components/bootstrap/dist/css/bootstrap.min.css"],
-    "js": [
-      "bower_components/jquery/dist/jquery.min.js",
-      "bower_components/bootstrap/js/tooltip.js",
-      "bower_components/bootstrap/dist/js/bootstrap.min.js",
-      "content_script.js"]
+    "js": ["content_script.js"]
   }],
   "browser_action": {
-    "default_title": "Tag you're it! Click to enable or disable tagging of web content."
-    },
-    "manifest_version": 2
+    "default_title": "Tag you're it! Click to enable or disable tagging of web content.",
+    "default_icon": "icon48.png",
+    "default_popup": "popup.html"
+  }
 }
diff --git a/src/popup.html b/src/popup.html
new file mode 100644
index 0000000..4fb4da6
--- /dev/null
+++ b/src/popup.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Popup menu for TagIt plugin</title>
+
+  <script src="vendor/angular/angular.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="vendor/bootstrap/dist/css/bootstrap.min.css">
+
+  <style type="text/css">
+    .container {
+      width: 250px;
+    }
+  </style>
+
+</head>
+<body class="container">
+  <h1>Tag you're it</h1>
+  <div class="btn-group" role="group" aria-label="...">
+    <button type="button" class="btn btn-default">Open</button>
+    <button type="button" class="btn btn-default">Close</button>
+  </div>
+  <p></p>
+  <form>
+    <div class="form-group">
+      <label for="backend-server-query-url">Backend: Url to query:</label>
+      <input type="text" class="form-control" id="backend-server-query-url" placeholder="backend query url">
+    </div>
+    <div class="form-group">
+      <label for="backend-server-store-url">Backend: Url to store information on:</label>
+      <input type="text" class="form-control" id="backend-server-store-url" placeholder="backend storage url">
+    </div>
+    <div class="form-group">
+      <label for="user-email">User email to associate tagging information with:</label>
+      <input type="email" class="form-control" id="user-email" placeholder="user email">
+    </div>
+  </form>
+</body>
+</html>
\ No newline at end of file