diff --git a/public/potlatch2/features/bugs/fixed.png b/public/potlatch2/features/bugs/fixed.png
new file mode 100644
index 000000000..99c265bf4
Binary files /dev/null and b/public/potlatch2/features/bugs/fixed.png differ
diff --git a/public/potlatch2/features/bugs/invalid.png b/public/potlatch2/features/bugs/invalid.png
new file mode 100644
index 000000000..35bddf13f
Binary files /dev/null and b/public/potlatch2/features/bugs/invalid.png differ
diff --git a/public/potlatch2/features/bugs/open.png b/public/potlatch2/features/bugs/open.png
new file mode 100644
index 000000000..4432db938
Binary files /dev/null and b/public/potlatch2/features/bugs/open.png differ
diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index 24c3f4758..154592b66 100644
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -9,62 +9,57 @@
 		<name>OSM - Osmarender</name>
 		<url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
 	</set>
-	<set>
+	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS OpenData Streetview</name>
 		<url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
 		<sourcetag>OS OpenData StreetView</sourcetag>
 	</set>
-	<set>
+	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS OpenData Locator</name>
 		<url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
 		<sourcetag>OS OpenData Locator</sourcetag>
 	</set>
-	<set>
+	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS 1:25k historic</name>
 		<url>http://ooc.openstreetmap.org/os1/$z/$x/$y.png</url>
 		<sourcetag>OS 1:25k</sourcetag>
 	</set>
-	<set>
+	<set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
 		<name>OS 7th Series historic</name>
 		<url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
 		<sourcetag>OS7</sourcetag>
 	</set>
-	<set>
+	<set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">
 		<name>OS New Popular Edition historic</name>
 		<url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url>
 		<sourcetag>NPE</sourcetag>
 	</set>
-	<set>
+	<set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
 		<name>OS Scottish Popular historic</name>
 		<url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url>
 		<sourcetag>NPE</sourcetag>
 	</set>
-	<set>
+	<set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">
 		<name>Surrey aerial</name>
 		<url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url>
 		<sourcetag>Surrey aerial</sourcetag>
 	</set>
-	<set>
-		<name>NearMap aerial</name>
-		<url>http://www.nearmap.com/maps/nml=Vert&amp;zxy=$z,$x,$y</url>
-		<sourcetag>NearMap</sourcetag>
-	</set>
-	<set>
+	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
 		<name>Haiti - GeoEye Jan 13</name>
 		<url>http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg</url>
 		<sourcetag>Haiti GeoEye</sourcetag>
 	</set>
-	<set>
+	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
 		<name>Haiti - GeoEye Jan 13+</name>
 		<url>http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg</url>
 		<sourcetag>Haiti GeoEye</sourcetag>
 	</set>
-	<set>
+	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
 		<name>Haiti - DigitalGlobe</name>
 		<url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url>
 		<sourcetag>Haiti DigitalGlobe</sourcetag>
 	</set>
-	<set>
+	<set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
 		<name>Haiti - Street names</name>
 		<url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url>
 		<sourcetag>Haiti streetnames</sourcetag>
diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
index d4ae0d770..809835b0d 100644
--- a/public/potlatch2/potlatch.css
+++ b/public/potlatch2/potlatch.css
@@ -52,7 +52,7 @@ way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; .path;}
 way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
 way[highway=cycleway]  { color: Blue; width: 2; dashes: 4, 2; set .path;}
 way[railway=tram]      {z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
-way .path              {text:name; text-color: black; text-position: offset; text-offset: 3;}
+way .path              {text:name; text-color: black; text-position: offset; text-offset: 5;}
 
 /* Could be improved */
 way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 4431b4a92..a77f27900 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets.xml b/public/potlatch2/stylesheets.xml
index 675251882..c9abed15a 100644
--- a/public/potlatch2/stylesheets.xml
+++ b/public/potlatch2/stylesheets.xml
@@ -17,4 +17,8 @@
         <name>GPS</name>
         <url>gpx.css</url>
     </stylesheet>
+    <stylesheet>
+        <name>Bugs</name>
+        <url>bugs.css</url>
+    </stylesheet>
 </stylesheets>
diff --git a/public/potlatch2/vectors.xml b/public/potlatch2/vectors.xml
new file mode 100644
index 000000000..014903213
--- /dev/null
+++ b/public/potlatch2/vectors.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<vectors>
+    <set loaded="true">
+      <name>Mapdust Bugs</name>
+      <loader>BugLoader</loader>
+      <url>http://www.mapdust.com/api/</url>
+      <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
+    </set>
+    <set>
+      <name>Bike Shop Locator - Missing Shops</name>
+      <loader>BikeShopLoader</loader>
+      <url>http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/</url>
+    </set>
+    <set>
+      <name>Everyone's GPS tracks</name>
+      <loader>TrackLoader</loader>
+      <!-- doesn't need a URL -->
+    </set>
+    <set disabled="true">
+      <name>A particular GPX file</name>
+      <loader>GPXImporter</loader>
+      <url></url>
+    </set>
+</vectors>
\ No newline at end of file