diff --git a/ckanext/harvest/controllers/view.py b/ckanext/harvest/controllers/view.py
index 05d50b7..219ad04 100644
--- a/ckanext/harvest/controllers/view.py
+++ b/ckanext/harvest/controllers/view.py
@@ -152,11 +152,10 @@ class ViewController(BaseController):
 
     def map_view(self,id):
         #check if package exists
-        pkg = Package.get(id)
-        if pkg is None:
+        c.pkg = Package.get(id)
+        if c.pkg is None:
             abort(404, 'Package not found')
 
-        c.url = pkg.url
         return render('ckanext/harvest/map.html')
 
 
diff --git a/ckanext/harvest/html.py b/ckanext/harvest/html.py
index ac87f9c..b6d29c7 100644
--- a/ckanext/harvest/html.py
+++ b/ckanext/harvest/html.py
@@ -1,5 +1,5 @@
 MAP_VIEW="""
 <div class="mapview">
-    <a href="/package/%(name)s/map">View in map</a>
+    <a href="/package/%(name)s/map">View available WMS layers &raquo;</a>
 </div>
 """
diff --git a/public/ckanext/harvest/js/mapviewer.js b/public/ckanext/harvest/js/mapviewer.js
index 87625b2..a9f95fe 100644
--- a/public/ckanext/harvest/js/mapviewer.js
+++ b/public/ckanext/harvest/js/mapviewer.js
@@ -144,7 +144,7 @@ CKAN.MapViewer = function($){
 
 
 OpenLayers.ImgPath = "/ckanext/harvest/js/openlayers/img/";
-OpenLayers.Lang.en.overlays = "Layers";
+OpenLayers.Lang.en.overlays = "Available Layers:";
 
 OpenLayers.Control.CustomMousePosition = OpenLayers.Class(OpenLayers.Control.MousePosition,{
         formatOutput: function(lonLat) {
diff --git a/public/ckanext/harvest/mapviewer.css b/public/ckanext/harvest/mapviewer.css
index c81bc1c..5e2c2c0 100644
--- a/public/ckanext/harvest/mapviewer.css
+++ b/public/ckanext/harvest/mapviewer.css
@@ -7,3 +7,13 @@
     display: inline;
     margin-left: 20px;
 }
+
+/* OpenLayers */
+.dataLbl{
+    font-weight: bold;
+    margin-bottom: 20px;
+}
+
+.dataLayersDiv span{
+    margin-left: 10px;
+}
diff --git a/templates/ckanext/harvest/map.html b/templates/ckanext/harvest/map.html
index fb5e4ab..0d89926 100644
--- a/templates/ckanext/harvest/map.html
+++ b/templates/ckanext/harvest/map.html
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
 
-  <py:def function="page_title">WMS preview</py:def>
+  <py:def function="page_title">${c.pkg.title or c.pkg.name} - WMS preview</py:def>
 
   <py:def function="optional_head">
     <link type="text/css" rel="stylesheet" media="all" href="/ckanext/harvest/mapviewer.css" />
@@ -13,16 +13,34 @@
   
 <div py:match="content">
   <div class="map-view-content">
-      <h2>WMS preview</h2>
+    <h2 class="head">
+      ${c.pkg.title}
+    </h2>
+    
+    <!-- Source URL -->    
+    <div class="url" py:if="c.pkg.url">
+      <p>
+        Source: <a href="${c.pkg.url}" target="_blank">${c.pkg.url}</a>
+      </p>
+    </div>
+    <p>
+    <a
+      href="${url(controller='package', action='read', id=c.pkg.name)}"
+      title="Package Details">
+      Package details</a>
+    </p>
+      <div class="package subsection">
+      <h3>WMS preview</h3>
       <script type="text/javascript">
         //<![CDATA[
         $(document).ready(function(){
-            CKAN.MapViewer.setup("${c.url}");
+            CKAN.MapViewer.setup("${c.pkg.url}");
         })
         //]]>
       </script>
     <div id="map"></div>
     <div id="layers"></div>
+    </div>
   </div>
 </div>
 <xi:include href="../../layout.html" />