diff --git a/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java b/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java
deleted file mode 100644
index bd197b0..0000000
--- a/web/gui/src/main/java/org/onlab/onos/gui/GreetResource.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2014 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onlab.onos.gui;
-
-import org.onlab.rest.BaseResource;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
-
-/**
- * Simple example of a GUI JAX-RS resource.
- */
-@Path("greet")
-public class GreetResource extends BaseResource {
-
-    @GET
-    public Response yo(@QueryParam("name") @DefaultValue("dude") String name) {
-        return Response.ok("Yo!!!").build();
-    }
-
-}
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java
index b63e3e0..4e73f77 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java
@@ -18,284 +18,53 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.net.Annotations;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyGraph;
-import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.net.topology.TopologyVertex;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
 import org.onlab.rest.BaseResource;
 
 import javax.ws.rs.GET;
-import javax.ws.rs.PathParam;
+import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
-
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.HostId.hostId;
 
 /**
  * Topology viewer resource.
  */
-@javax.ws.rs.Path("topology")
+@Path("topology")
 public class TopologyResource extends BaseResource {
 
-    private static final String HOST_SEP = "/";
+    private final ObjectMapper mapper = new ObjectMapper();
 
-    @javax.ws.rs.Path("/graph")
+    @Path("/geoloc")
     @GET
     @Produces("application/json")
-    public Response graph() {
-        // Fetch the services we'll be using.
-        DeviceService deviceService = get(DeviceService.class);
-        HostService hostService = get(HostService.class);
-        TopologyService topologyService = get(TopologyService.class);
-
-        // Fetch the current topology and its graph that we'll use to render.
-        Topology topo = topologyService.currentTopology();
-        TopologyGraph graph = topologyService.getGraph(topo);
-
-        ObjectMapper mapper = new ObjectMapper();
+    public Response getGeoLocations() {
         ObjectNode rootNode = mapper.createObjectNode();
-        rootNode.set("devices", getDevices(mapper, deviceService, graph));
-        rootNode.set("links", getLinks(mapper, topo, graph));
-        rootNode.set("hosts", getHosts(mapper, hostService));
+        ArrayNode devices = mapper.createArrayNode();
+        ArrayNode hosts = mapper.createArrayNode();
+
+        Map<String, ObjectNode> metaUi = TopologyViewMessages.getMetaUi();
+        for (String id : metaUi.keySet()) {
+            ObjectNode memento = metaUi.get(id);
+            if (id.charAt(12) == '/') {
+                addGeoData(hosts, "id", id, memento);
+            } else {
+                addGeoData(devices, "uri", id, memento);
+            }
+        }
+
+        rootNode.set("devices", devices);
+        rootNode.set("hosts", hosts);
         return Response.ok(rootNode.toString()).build();
     }
 
-    @javax.ws.rs.Path("/graph/{id}")
-    @GET
-    @Produces("application/json")
-    public Response details(@PathParam("id") String id) {
-        if (id.contains(HOST_SEP)) {
-            return hostDetails(hostId(id));
-        }
-        return deviceDetails(deviceId(id));
+    private void addGeoData(ArrayNode array, String idField, String id,
+                            ObjectNode memento) {
+        ObjectNode node = mapper.createObjectNode().put(idField, id);
+        ObjectNode annot = mapper.createObjectNode();
+        node.set("annotations", annot);
+        annot.put("latitude", memento.get("lat").asDouble())
+                .put("longitude", memento.get("lng").asDouble());
+        array.add(node);
     }
 
-    // Returns device details response.
-    private Response deviceDetails(DeviceId deviceId) {
-        DeviceService deviceService = get(DeviceService.class);
-        Device device = deviceService.getDevice(deviceId);
-        Annotations annot = device.annotations();
-        int portCount = deviceService.getPorts(deviceId).size();
-        ObjectNode r = json(deviceId.toString(),
-                            device.type().toString().toLowerCase(),
-                            new Prop("Name", annot.value("name")),
-                            new Prop("Vendor", device.manufacturer()),
-                            new Prop("H/W Version", device.hwVersion()),
-                            new Prop("S/W Version", device.swVersion()),
-                            new Prop("Serial Number", device.serialNumber()),
-                            new Separator(),
-                            new Prop("Latitude", annot.value("latitude")),
-                            new Prop("Longitude", annot.value("longitude")),
-                            new Prop("Ports", Integer.toString(portCount)));
-        return Response.ok(r.toString()).build();
-    }
-
-    // Returns host details response.
-    private Response hostDetails(HostId hostId) {
-        HostService hostService = get(HostService.class);
-        Host host = hostService.getHost(hostId);
-        Annotations annot = host.annotations();
-        ObjectNode r = json(hostId.toString(), "host",
-                            new Prop("MAC", host.mac().toString()),
-                            new Prop("IP", host.ipAddresses().toString()),
-                            new Separator(),
-                            new Prop("Latitude", annot.value("latitude")),
-                            new Prop("Longitude", annot.value("longitude")));
-        return Response.ok(r.toString()).build();
-    }
-
-    // Produces JSON property details.
-    private ObjectNode json(String id, String type, Prop... props) {
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectNode result = mapper.createObjectNode()
-                .put("id", id).put("type", type);
-        ObjectNode pnode = mapper.createObjectNode();
-        ArrayNode porder = mapper.createArrayNode();
-        for (Prop p : props) {
-            porder.add(p.key);
-            pnode.put(p.key, p.value);
-        }
-        result.set("propOrder", porder);
-        result.set("props", pnode);
-        return result;
-    }
-
-    // Encodes all infrastructure devices.
-    private ArrayNode getDevices(ObjectMapper mapper, DeviceService deviceService,
-                                 TopologyGraph graph) {
-        ArrayNode devices = mapper.createArrayNode();
-        for (TopologyVertex vertex : graph.getVertexes()) {
-            devices.add(json(mapper, deviceService.getDevice(vertex.deviceId()),
-                             deviceService.isAvailable(vertex.deviceId())));
-        }
-        return devices;
-    }
-
-    // Encodes all infrastructure links.
-    private ArrayNode getLinks(ObjectMapper mapper, Topology topo, TopologyGraph graph) {
-        // Now scan all links and count number of them between the same devices
-        // using a normalized link key.
-        Map<String, AggLink> linkRecords = aggregateLinks();
-
-        // Now build all interior edges using the aggregated links.
-        ArrayNode links = mapper.createArrayNode();
-        for (AggLink lr : linkRecords.values()) {
-            links.add(json(mapper, lr));
-        }
-        return links;
-    }
-
-    // Encodes all end-station hosts.
-    private ArrayNode getHosts(ObjectMapper mapper, HostService hostService) {
-        ArrayNode hosts = mapper.createArrayNode();
-        for (Host host : hostService.getHosts()) {
-            Set<IpAddress> ipAddresses = host.ipAddresses();
-            IpAddress ipAddress = ipAddresses.isEmpty() ? null : ipAddresses.iterator().next();
-            String label = ipAddress != null ? ipAddress.toString() : host.mac().toString();
-            hosts.add(json(mapper, host));
-        }
-        return hosts;
-    }
-
-    // Scan all links and counts number of them between the same devices
-    // using a normalized link key.
-    private Map<String, AggLink> aggregateLinks() {
-        Map<String, AggLink> aggLinks = new HashMap<>();
-        LinkService linkService = get(LinkService.class);
-        for (Link link : linkService.getLinks()) {
-            String key = key(link);
-            AggLink lr = aggLinks.get(key);
-            if (lr == null) {
-                lr = new AggLink(key);
-                aggLinks.put(key, lr);
-            }
-            lr.addLink(link);
-        }
-        return aggLinks;
-    }
-
-    // Produces JSON for a device.
-    private ObjectNode json(ObjectMapper mapper, Device device, boolean isOnline) {
-        ObjectNode node = mapper.createObjectNode()
-                .put("id", device.id().toString())
-                .put("type", device.type().toString().toLowerCase())
-                .put("online", isOnline);
-        node.set("labels", labels(mapper,
-                                  device.id().uri().getSchemeSpecificPart(),
-                                  MacAddress.valueOf(device.chassisId().value()).toString(),
-                                  device.serialNumber()));
-        return node;
-    }
-
-    // Produces JSON for a link.
-    private ObjectNode json(ObjectMapper mapper, AggLink aggLink) {
-        Link link = aggLink.link;
-        ConnectPoint src = link.src();
-        ConnectPoint dst = link.dst();
-        return mapper.createObjectNode()
-                .put("src", src.deviceId().toString())
-                .put("srcPort", src.port().toString())
-                .put("dst", dst.deviceId().toString())
-                .put("dstPort", dst.port().toString())
-                .put("type", link.type().toString().toLowerCase())
-                .put("linkWidth", aggLink.links.size());
-    }
-
-    // Produces JSON for a device.
-    private ObjectNode json(ObjectMapper mapper, Host host) {
-        ObjectNode json = mapper.createObjectNode()
-                .put("id", host.id().toString());
-        json.set("cp", location(mapper, host.location()));
-        json.set("labels", labels(mapper, ip(host.ipAddresses()),
-                                  host.mac().toString()));
-        return json;
-    }
-
-    private String ip(Set<IpAddress> ipAddresses) {
-        Iterator<IpAddress> it = ipAddresses.iterator();
-        return it.hasNext() ? it.next().toString() : "unknown";
-    }
-
-    private ObjectNode location(ObjectMapper mapper, HostLocation location) {
-        return mapper.createObjectNode()
-                .put("device", location.deviceId().toString())
-                .put("port", location.port().toLong());
-    }
-
-    private ArrayNode labels(ObjectMapper mapper, String... labels) {
-        ArrayNode json = mapper.createArrayNode();
-        for (String label : labels) {
-            json.add(label);
-        }
-        return json;
-    }
-
-    // Aggregate link of all links between the same devices regardless of
-    // their direction.
-    private class AggLink {
-        Link link; // representative links
-
-        final String key;
-        final Set<Link> links = new HashSet<>();
-
-        AggLink(String key) {
-            this.key = key;
-        }
-
-        void addLink(Link link) {
-            links.add(link);
-            if (this.link == null) {
-                this.link = link;
-            }
-        }
-    }
-
-    // Returns a canonical key for the specified link.
-    static String key(Link link) {
-        String s = id(link.src());
-        String d = id(link.dst());
-        return s.compareTo(d) > 0 ? d + s : s + d;
-    }
-
-    // Returns a formatted string for the element associated with the given
-    // connection point.
-    private static String id(ConnectPoint cp) {
-        return cp.elementId().toString();
-    }
-
-    // Auxiliary key/value carrier.
-    private class Prop {
-        private final String key;
-        private final String value;
-
-        protected Prop(String key, String value) {
-            this.key = key;
-            this.value = value;
-        }
-    }
-
-    private class Separator extends Prop {
-        protected Separator() {
-            super("-", "");
-        }
-    }
 }
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
index b951d0f..f210b1d 100644
--- a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
+++ b/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
@@ -66,6 +66,7 @@
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -129,6 +130,15 @@
     private static Map<String, ObjectNode> metaUi = new ConcurrentHashMap<>();
 
     /**
+     * Returns read-only view of the meta-ui information.
+     *
+     * @return map of id to meta-ui mementos
+     */
+    static Map<String, ObjectNode> getMetaUi() {
+        return Collections.unmodifiableMap(metaUi);
+    }
+
+    /**
      * Creates a messaging facility for creating messages for topology viewer.
      *
      * @param directory service directory