diff --git a/app/views/layers/index.html.haml b/app/views/layers/index.html.haml
index e8c4cd43..470a5302 100644
--- a/app/views/layers/index.html.haml
+++ b/app/views/layers/index.html.haml
@@ -57,7 +57,10 @@
                     %circle{cx:"15",cy:"15",r:"15",fill:"#{layer.color}"}
               = link_to map_layer_url(layer.map,layer) do
                 = layer.title
-                (#{layer.places.count})
+                - if layer.ltype == 'geojson'
+                  %small (GeoJSON)
+                - else
+                  %small (#{layer.places.count})
               - if layer.published
                 %i.fi-eye.fi-24{title: 'Layer is published'}
               - else
diff --git a/app/views/layers/show.html.haml b/app/views/layers/show.html.haml
index dc691f70..27d74090 100644
--- a/app/views/layers/show.html.haml
+++ b/app/views/layers/show.html.haml
@@ -29,7 +29,7 @@
               <svg version="1.1" id="icons-layers" class="icons" xmlns:serif="http://www.serif.com/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve"><g><path d="M66.4,25.4c-0.1-0.6-0.5-1-1-1.3L35.8,11.8c-0.6-0.2-1.2-0.2-1.7,0.2l-5.5,4.3L23,13.9c-0.6-0.2-1.2-0.2-1.7,0.2L2.3,29c-0.5,0.4-0.7,1-0.6,1.5c0.1,0.6,0.5,1.1,1,1.3L14.5,37l-3.6,2.8c-0.5,0.4-0.7,1-0.6,1.5c0.1,0.6,0.5,1.1,1,1.3l31.6,13.7c0.2,0.1,0.4,0.1,0.7,0.1c0.4,0,0.8-0.2,1.2-0.5l17-16.1c0.4-0.4,0.6-1,0.5-1.5c-0.1-0.6-0.5-1-1-1.3L57,35.3l8.9-8.4C66.3,26.6,66.5,26,66.4,25.4z M6.6,29.9l16.1-12.4l2.9,1.2L15,26.8c-0.5,0.4-0.7,1-0.6,1.5c0.1,0.6,0.5,1.1,1,1.3l5.5,2.4l1.8,0.8l1.8,0.8l13.1,5.6L34.6,42l-13.5-5.8l-1.8-0.8l-1.8-0.8L6.6,29.9z M57.6,39.3L43.2,52.8l-28-12.1l2.8-2.2l16.2,7c0.2,0.1,0.4,0.1,0.7,0.1c0.4,0,0.8-0.2,1.2-0.5l4.8-4.5l6.1,2.7c0.2,0.1,0.4,0.1,0.7,0.1c0.4,0,0.8-0.2,1.2-0.5l5.4-5.1L57.6,39.3z M53.6,33.9l-1.3,1.3l-1.3,1.3l-3.5,3.3l-3.8-1.6l-1.7-0.7l-1.7-0.7l-12.7-5.5l-1.8-0.8l-1.8-0.8l-4.6-2l9.8-7.6l1.5-1.2l1.5-1.2l3.2-2.5l26.3,11L53.6,33.9z"/></g></svg>
 
           =simple_form_for :navselector, url: '', html: { method: :get }  do |f|
-            = f.input :id, :collection => @map_layers.map { |l| ["#{l.title} (#{l.places.count})", "/maps/#{@map.id}/layers/#{l.id}", :class => "layer-#{l.id} input-group-field"] }, :label => false, :selected => "/maps/#{@map.id}/layers/#{@layer.id}", :include_blank => 'All layers', input_html: {:class => 'nav-selector', :data => { :map => @map.id}}
+            = f.input :id, :collection => @map_layers.map { |l| ["#{l.title} (#{l.ltype == 'geojson' ? 'GeoJSON' : l.places.count})", "/maps/#{@map.id}/layers/#{l.id}", :class => "layer-#{l.id} input-group-field"] }, :label => false, :selected => "/maps/#{@map.id}/layers/#{@layer.id}", :include_blank => 'All layers', input_html: {:class => 'nav-selector', :data => { :map => @map.id}}
 
           .input-group-button
             = link_to edit_map_layer_path(@map,@layer), :class => 'button secondary', :title => 'Edit this layer' do
diff --git a/app/views/maps/show.html.haml b/app/views/maps/show.html.haml
index 946d74fa..3c54153e 100644
--- a/app/views/maps/show.html.haml
+++ b/app/views/maps/show.html.haml
@@ -59,7 +59,7 @@
               .input-group-label
                 = link_to map_layers_path(@map), :title => "Show all layers of this map"  do
                   <svg version="1.1" id="icons-layers" class="icons" xmlns:serif="http://www.serif.com/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve"><g><path d="M66.4,25.4c-0.1-0.6-0.5-1-1-1.3L35.8,11.8c-0.6-0.2-1.2-0.2-1.7,0.2l-5.5,4.3L23,13.9c-0.6-0.2-1.2-0.2-1.7,0.2L2.3,29c-0.5,0.4-0.7,1-0.6,1.5c0.1,0.6,0.5,1.1,1,1.3L14.5,37l-3.6,2.8c-0.5,0.4-0.7,1-0.6,1.5c0.1,0.6,0.5,1.1,1,1.3l31.6,13.7c0.2,0.1,0.4,0.1,0.7,0.1c0.4,0,0.8-0.2,1.2-0.5l17-16.1c0.4-0.4,0.6-1,0.5-1.5c-0.1-0.6-0.5-1-1-1.3L57,35.3l8.9-8.4C66.3,26.6,66.5,26,66.4,25.4z M6.6,29.9l16.1-12.4l2.9,1.2L15,26.8c-0.5,0.4-0.7,1-0.6,1.5c0.1,0.6,0.5,1.1,1,1.3l5.5,2.4l1.8,0.8l1.8,0.8l13.1,5.6L34.6,42l-13.5-5.8l-1.8-0.8l-1.8-0.8L6.6,29.9z M57.6,39.3L43.2,52.8l-28-12.1l2.8-2.2l16.2,7c0.2,0.1,0.4,0.1,0.7,0.1c0.4,0,0.8-0.2,1.2-0.5l4.8-4.5l6.1,2.7c0.2,0.1,0.4,0.1,0.7,0.1c0.4,0,0.8-0.2,1.2-0.5l5.4-5.1L57.6,39.3z M53.6,33.9l-1.3,1.3l-1.3,1.3l-3.5,3.3l-3.8-1.6l-1.7-0.7l-1.7-0.7l-12.7-5.5l-1.8-0.8l-1.8-0.8l-4.6-2l9.8-7.6l1.5-1.2l1.5-1.2l3.2-2.5l26.3,11L53.6,33.9z"/></g></svg>
-              = f.input "id", :collection => @map_layers.map { |l| ["#{l.title} (#{l.places.count})", "/maps/#{@map.id}/layers/#{l.id}", :class => "layer-#{l.id} input-group-field"] }, :label => false, :include_blank => 'Select a layer...', input_html: {:class => 'nav-selector'}
+              = f.input "id", :collection => @map_layers.map { |l| ["#{l.title} (#{l.ltype == 'geojson' ? 'GeoJSON' : l.places.count})", "/maps/#{@map.id}/layers/#{l.id}", :class => "layer-#{l.id} input-group-field"] }, :label => false, :include_blank => 'Select a layer...', input_html: {:class => 'nav-selector'}
               .input-group-button
                 = link_to new_map_layer_path(@map), :class => 'button secondary', :title => 'Create new layer' do
                   %i.fi-plus.fi-24