diff --git a/app/assets/javascripts/src/Metamaps.Create.js b/app/assets/javascripts/src/Metamaps.Create.js
index 29dccb09..f009eecb 100644
--- a/app/assets/javascripts/src/Metamaps.Create.js
+++ b/app/assets/javascripts/src/Metamaps.Create.js
@@ -293,7 +293,6 @@ Metamaps.Create = {
         Metamaps.Create.newTopic.pinned = false
       }
       $('#topic_name').typeahead('val', '')
-      Metamaps.Create.newTopic.beingCreated = false
       Metamaps.Create.newTopic.hideSelector()
     }
   },
diff --git a/app/assets/javascripts/src/Metamaps.Map.js b/app/assets/javascripts/src/Metamaps.Map.js
index 1c3c638d..2fb4c575 100644
--- a/app/assets/javascripts/src/Metamaps.Map.js
+++ b/app/assets/javascripts/src/Metamaps.Map.js
@@ -247,7 +247,7 @@ Metamaps.Map = {
     var nextX = self.nextX
     var nextY = self.nextY
 
-    var DISTANCE_BETWEEN = 120
+    var DISTANCE_BETWEEN = 250
 
     self.nextX = self.nextX + DISTANCE_BETWEEN * self.nextXshift
     self.nextY = self.nextY + DISTANCE_BETWEEN * self.nextYshift
diff --git a/app/assets/stylesheets/.application.css.erb.swp b/app/assets/stylesheets/.application.css.erb.swp
new file mode 100644
index 00000000..2a1d7364
Binary files /dev/null and b/app/assets/stylesheets/.application.css.erb.swp differ
diff --git a/app/assets/stylesheets/application.css.erb b/app/assets/stylesheets/application.css.erb
index 0b21f5a7..4a45cc4f 100644
--- a/app/assets/stylesheets/application.css.erb
+++ b/app/assets/stylesheets/application.css.erb
@@ -606,8 +606,8 @@ button.button.btn-no:hover {
     background-image: url(<%= asset_data_uri('pincarousel_sprite.png') %>);
     position: absolute;
     z-index: 2;
-    top: 20px;
-    right: 16px;
+    top: -20px;
+    right: -16px;
 }
 .pinCarousel:hover {
     background-position: 0 -16px;
diff --git a/app/views/maps/_newtopic.html.erb b/app/views/maps/_newtopic.html.erb
index 4e3644ab..416191c6 100644
--- a/app/views/maps/_newtopic.html.erb
+++ b/app/views/maps/_newtopic.html.erb
@@ -31,6 +31,7 @@
     Metamaps.Create.newSelectedMetacodeNames.push("<%= metacode.name %>");
   <% end %>
 <% end %> 
+Metamaps.Create.newTopic.metacode = <%= user_metacode().id %>
 <% current_user.recentMetacodes.each do |id| %>
     Metamaps.Create.recentMetacodes.push(<%= id %>);
 <% end %>
diff --git a/frontend/src/components/MetacodeSelect.js b/frontend/src/components/MetacodeSelect.js
index e8cde277..e71a3614 100644
--- a/frontend/src/components/MetacodeSelect.js
+++ b/frontend/src/components/MetacodeSelect.js
@@ -62,11 +62,11 @@ class MetacodeSelect extends Component {
     } else if (activeTab == 1) { // recent
       selectMetacodes = recent.map(id => {
         return metacodes.find(m => m.id == id)
-      })
+      }).filter(m => m)
     } else if (activeTab == 2) { // mostUsed
       selectMetacodes = mostUsed.map(id => {
         return metacodes.find(m => m.id == id)
-      })
+      }).filter(m => m)
     }
     return selectMetacodes
   }