diff --git a/umap/static/umap/umap.css b/umap/static/umap/umap.css
index c4e214b2..ff2d98e4 100644
--- a/umap/static/umap/umap.css
+++ b/umap/static/umap/umap.css
@@ -201,6 +201,9 @@ body.content #storage-ui-container {
     right: 0;
     left: 0;
     bottom: inherit;
-    height: 30%;
-*/    background-color: #fff;
+    height: 30%;*/
+    background-color: #fff;
+}
+#id_editors + br + span.helptext {
+    display: none;
 }
\ No newline at end of file
diff --git a/umap/templates/base.html b/umap/templates/base.html
index 91528aa4..34642185 100644
--- a/umap/templates/base.html
+++ b/umap/templates/base.html
@@ -11,12 +11,14 @@
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/form.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/color/seagreen.css">
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/debug.css">
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}darline/src/css/autocomplete.css">
     <link rel="stylesheet" href="{{ STATIC_URL }}storage/contrib/css/storage.ui.default.css">
     <link rel="stylesheet" href="{{ STATIC_URL }}umap/umap.css">
     {% endcompress css %}
     {% compress js %}
     <script src="{{ STATIC_URL }}darline/src/js/core.js"></script>
     <script src="{{ STATIC_URL }}darline/src/js/debug.js"></script>
+    <script src="{{ STATIC_URL }}darline/src/js/autocomplete.js"></script>
     {% endcompress js %}
     <!-- IE Fix for HTML5 Tags -->
     <!--[if lt IE 9]>
@@ -47,6 +49,9 @@
                     D.DOM.toggleClass(this.parentNode, "on");
                 }
                 D.Event.on('fieldset.toggle legend', 'click', fn);
+                D.autoComplete('#id_editors', {
+                    placeholder: "Type editors nick to add..."
+                }).multiselect();
             });
             var getMore = function (e) {
                 D.Event.stop(e);
diff --git a/umap/views.py b/umap/views.py
index 4f0c79b9..d88e48e6 100644
--- a/umap/views.py
+++ b/umap/views.py
@@ -79,7 +79,7 @@ class UserMaps(DetailView, PaginatorMixin):
     context_object_name = "current_user"
 
     def get_context_data(self, **kwargs):
-        maps = Map.objects.filter(Q(owner=self.object) | Q(editors=self.object)).order_by('-modified_at')[:30]
+        maps = Map.objects.filter(Q(owner=self.object) | Q(editors=self.object)).distinct().order_by('-modified_at')[:30]
         maps = self.paginate(maps)
         kwargs.update({
             "maps": maps