-<h1><%= @title %></h1>
-<p><%= @description %></p>
+<h1><%= @heading %></h1>
+<p><%= raw(@description) %></p>
<%= render :partial => 'changeset_paging_nav' %>
-<%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+
+<div id="changeset_list_container">
+ <%= render :partial => 'map' %>
+ <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+</div>
+
<%= render :partial => 'changeset_paging_nav' %>
-<%= atom_link_to params.merge({ :format => :atom }) %>
+<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
<% content_for :head do %>
-<%= auto_discovery_link_tag :atom, params.merge({ :format => :atom }) %>
+<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
<% end %>