diff --git a/index.html b/index.html
index 208f315..974a883 100644
--- a/index.html
+++ b/index.html
@@ -163,11 +163,11 @@
                                 <div class="content">
                                     <p class="control">
                                         <a class="button is-fullwidth" v-for="bundle_id in item.bundles"
-                                           v-on:click="toggleItemInBundle(bundle_id, item.id)"
-                                           v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'is-success' : 'is-danger']">
+                                           v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
+                                           v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
                                                 <span class="icon">
                                     <i class="fa"
-                                       v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'fa-check-square-o' : 'fa-square-o']"></i>
+                                       v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
                                 </span>
                                             <span>{{ static.bundles[bundle_id].name }}</span>
                                         </a>
@@ -236,12 +236,12 @@
                         </div>
                         <div class="content">
                             <p class="control">
-                                <a class="button is-danger is-fullwidth" v-for="bundle_id in item.bundles"
-                                   v-on:click="toggleItemInBundle(bundle_id, item.id)"
-                                   v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'is-success' : 'is-danger']">
+                                <a class="button is-fullwidth" v-for="bundle_id in item.bundles"
+                                   v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
+                                   v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
                                         <span class="icon">
                                     <i class="fa"
-                                       v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'fa-check-square-o' : 'fa-square-o']"></i>
+                                       v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
                                 </span>
                                     <span>{{ static.bundles[bundle_id].name }}</span>
                                 </a>
@@ -311,12 +311,12 @@
                                 </div>
                                 <div class="content">
                                     <p class="control">
-                                        <a class="button is-danger is-fullwidth" v-for="bundle_id in item.bundles"
-                                           v-on:click="toggleItemInBundle(bundle_id, item.id)"
-                                           v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'is-success' : 'is-danger']">
+                                        <a class="button is-fullwidth" v-for="bundle_id in item.bundles"
+                                           v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
+                                           v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
                                                 <span class="icon">
                                             <i class="fa"
-                                               v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'fa-check-square-o' : 'fa-square-o']"></i>
+                                               v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
                                         </span>
                                             <span>{{ static.bundles[bundle_id].name }}</span>
                                         </a>
@@ -388,12 +388,12 @@
                                 </div>
                                 <div class="content">
                                     <p class="control">
-                                        <a class="button is-danger is-fullwidth" v-for="bundle_id in item.bundles"
-                                           v-on:click="toggleItemInBundle(bundle_id, item.id)"
-                                           v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'is-success' : 'is-danger']">
+                                        <a class="button is-fullwidth" v-for="bundle_id in item.bundles"
+                                           v-on:click="toggleItemInBundle(bundle_id, item.id, $index)"
+                                           v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'is-success' : 'is-danger']">
                                                 <span class="icon">
                                             <i class="fa"
-                                               v-bind:class="[isItemInBundle(bundle_id, item.id) ? 'fa-check-square-o' : 'fa-square-o']"></i>
+                                               v-bind:class="[isItemInBundle(bundle_id, item.id, $index) ? 'fa-check-square-o' : 'fa-square-o']"></i>
                                         </span>
                                             <span>{{ static.bundles[bundle_id].name }}</span>
                                         </a>
@@ -426,6 +426,33 @@
     </div>
 </section>
 
+<footer class="footer">
+  <div class="container">
+    <div class="content is-centered is-text-centered">
+      <p>
+        <strong>Stardew Community Checklist</strong> by <a href="http://johncleaver.com">John Cleaver</a>. The source code is licensed
+        <a href="http://opensource.org/licenses/mit-license.php">MIT</a>.
+      </p>
+        <p>
+            Bundle and Item information is from the <a href="http://stardewvalleywiki.com/Stardew_Valley_Wiki">Stardew Valley Wiki</a>
+            and is used under the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC BY-NC-SA 3.0 License</a>.
+        </p>
+        <p>
+            <a href="http://stardewvalley.net/">Stardew Valley</a> &copy; <a href="">Chucklefish LTD</a>.
+            Developed by <a href="https://twitter.com/ConcernedApe">ConcernedApe</a>.
+        </p>
+      <p>
+        <a class="icon" href="https://github.com/kihashi/stardew_community_checklist">
+          <i class="fa fa-github"></i>
+        </a>
+          <a class="icon" href="https://www.reddit.com/r/stardewvalley">
+              <i class="fa fa-reddit"></i>
+          </a>
+      </p>
+    </div>
+  </div>
+</footer>
+
 <!-- Javascript -->
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/vue/1.0.17/vue.min.js"></script>
 <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/vue-resource/0.1.16/vue-resource.min.js"></script>
diff --git a/main.js b/main.js
index f5132a2..0574481 100644
--- a/main.js
+++ b/main.js
@@ -70,23 +70,31 @@ var v = new Vue({
         change_skill: function(new_skill){
             this.active_skill = new_skill;
         },
-        addItemToBundle: function(bundleId, itemId){
-            this.user_data[bundleId].push(itemId);
+        addItemToBundle: function(bundleId, itemId, itemPosition){
+            this.user_data[bundleId].push({item: itemId, position: itemPosition});
         },
-        removeItemFromBundle: function(bundleId, itemId){
-            i = this.user_data[bundleId].indexOf(itemId);
-            this.user_data[bundleId].splice(i, 1);
+        removeItemFromBundle: function(bundleId, itemId, itemPosition){
+            console.log("Removing item from bundle" + bundleId + " | " + itemId + " | " + itemPosition);
+            for(i = 0; i < this.user_data[bundleId].length; i++){
+                if(this.user_data[bundleId][i].item === itemId && this.user_data[bundleId][i].position === itemPosition){
+                    console.log("Found a match with: ");
+                    console.log(this.user_data[bundleId][i]);
+                    this.user_data[bundleId].splice(i, 1);
+                }
+            }
         },
-        toggleItemInBundle: function(bundleId, itemId){
-            if(this.isItemInBundle(bundleId, itemId)){
-                this.removeItemFromBundle(bundleId, itemId);
+        toggleItemInBundle: function(bundleId, itemId, itemPosition){
+            if(this.isItemInBundle(bundleId, itemId, itemPosition)){
+                this.removeItemFromBundle(bundleId, itemId, itemPosition);
             }
             else{
-                this.addItemToBundle(bundleId, itemId);
+                this.addItemToBundle(bundleId, itemId, itemPosition);
             }
         },
-        isItemInBundle: function(bundleId, itemId){
-            if(this.user_data[bundleId].indexOf(itemId) > -1){
+        isItemInBundle: function(bundleId, itemId, itemPosition){
+            if(this.user_data[bundleId].filter(function(element){
+                    return element.item === itemId && element.position === itemPosition;
+                }).length > 0){
                 return true;
             }
             else{