diff --git a/openstack_dashboard/dashboards/project/l3routers/ports/tables.py b/openstack_dashboard/dashboards/project/l3routers/ports/tables.py
index 369a8db..9a4192e 100644
--- a/openstack_dashboard/dashboards/project/l3routers/ports/tables.py
+++ b/openstack_dashboard/dashboards/project/l3routers/ports/tables.py
@@ -15,6 +15,7 @@
 import logging
 
 from django.core.urlresolvers import reverse
+from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
@@ -89,22 +90,37 @@ def delete(self, request, obj_id):
             exceptions.handle(request, msg, redirect=redirect)
 
 
+DISPLAY_CHOICES = (
+    ("UP", pgettext_lazy("Admin state of a Port", u"UP")),
+    ("DOWN", pgettext_lazy("Admin state of a Port", u"DOWN")),
+)
+STATUS_DISPLAY_CHOICES = (
+    ("ACTIVE", pgettext_lazy("current status of port", u"Active")),
+    ("BUILD", pgettext_lazy("current status of port", u"Build")),
+    ("DOWN", pgettext_lazy("current status of port", u"Down")),
+    ("ERROR", pgettext_lazy("current status of port", u"Error")),
+)
+
+
 class PortsTable(tables.DataTable):
-    name = tables.Column("name",
+    name = tables.Column("name_or_id",
                          verbose_name=_("Name"),
                          link="horizon:project:networking:ports:detail")
     fixed_ips = tables.Column(project_tables.get_fixed_ips,
                               verbose_name=_("Fixed IPs"))
-    status = tables.Column("status", verbose_name=_("Status"))
+    status = tables.Column("status",
+                           verbose_name=_("Status"),
+                           display_choices=STATUS_DISPLAY_CHOICES)
     device_owner = tables.Column(get_device_owner,
                                  verbose_name=_("Type"))
     admin_state = tables.Column("admin_state",
-                                verbose_name=_("Admin State"))
+                                verbose_name=_("Admin State"),
+                                display_choices=DISPLAY_CHOICES)
 
     def get_object_display(self, port):
         return port.id
 
-    class Meta:
+    class Meta(object):
         name = "interfaces"
         verbose_name = _("Interfaces")
         table_actions = (AddInterface, RemoveInterface)
diff --git a/openstack_dashboard/dashboards/project/l3routers/tables.py b/openstack_dashboard/dashboards/project/l3routers/tables.py
index 59eed27..c46e236 100644
--- a/openstack_dashboard/dashboards/project/l3routers/tables.py
+++ b/openstack_dashboard/dashboards/project/l3routers/tables.py
@@ -16,6 +16,7 @@
 
 from django.core.urlresolvers import reverse
 from django.template import defaultfilters as filters
+from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 from neutronclient.common import exceptions as q_ext
@@ -23,8 +24,10 @@
 from horizon import exceptions
 from horizon import messages
 from horizon import tables
+
 from openstack_dashboard import api
 from openstack_dashboard import policy
+from openstack_dashboard.usage import quotas
 
 LOG = logging.getLogger(__name__)
 
@@ -77,6 +80,20 @@ class CreateRouter(tables.LinkAction):
     icon = "plus"
     policy_rules = (("network", "create_router"),)
 
+    def allowed(self, request, datum=None):
+        usages = quotas.tenant_quota_usages(request)
+        # when Settings.OPENSTACK_NEUTRON_NETWORK['enable_quotas'] = False
+        # usages['routers'] is empty
+        if usages.get('routers', {}).get('available', 1) <= 0:
+            if "disabled" not in self.classes:
+                self.classes = [c for c in self.classes] + ["disabled"]
+                self.verbose_name = _("Create Router (Quota exceeded)")
+        else:
+            self.verbose_name = _("Create Router")
+            self.classes = [c for c in self.classes if c != "disabled"]
+
+        return True
+
 
 class EditRouter(policy.PolicyTargetMixin, tables.LinkAction):
     name = "update"
@@ -160,14 +177,32 @@ def get_external_network(router):
         return "-"
 
 
+class RoutersFilterAction(tables.FilterAction):
+
+    def filter(self, table, routers, filter_string):
+        """Naive case-insensitive search."""
+        query = filter_string.lower()
+        return [router for router in routers
+                if query in router.name.lower()]
+
+
 class RoutersTable(tables.DataTable):
+    STATUS_DISPLAY_CHOICES = (
+        ("active", pgettext_lazy("current status of router", u"Active")),
+        ("error", pgettext_lazy("current status of router", u"Error")),
+    )
+    ADMIN_STATE_DISPLAY_CHOICES = (
+        ("UP", pgettext_lazy("Admin state of a Router", u"UP")),
+        ("DOWN", pgettext_lazy("Admin state of a Router", u"DOWN")),
+    )
+
     name = tables.Column("name",
                          verbose_name=_("Name"),
                          link="horizon:project:l3routers:detail")
     status = tables.Column("status",
-                           filters=(filters.title,),
                            verbose_name=_("Status"),
-                           status=True)
+                           status=True,
+                           display_choices=STATUS_DISPLAY_CHOICES)
     distributed = tables.Column("distributed",
                                 filters=(filters.yesno, filters.capfirst),
                                 verbose_name=_("Distributed"))
@@ -177,6 +212,9 @@ class RoutersTable(tables.DataTable):
                        verbose_name=_("HA mode"))
     ext_net = tables.Column(get_external_network,
                             verbose_name=_("External Network"))
+    admin_state = tables.Column("admin_state",
+                                verbose_name=_("Admin State"),
+                                display_choices=ADMIN_STATE_DISPLAY_CHOICES)
 
     def __init__(self, request, data=None, needs_form_wrapper=None, **kwargs):
         super(RoutersTable, self).__init__(
@@ -192,10 +230,11 @@ def __init__(self, request, data=None, needs_form_wrapper=None, **kwargs):
     def get_object_display(self, obj):
         return obj.name
 
-    class Meta:
+    class Meta(object):
         name = "Routers"
         verbose_name = _("Routers")
         status_columns = ["status"]
         row_class = UpdateRow
-        table_actions = (CreateRouter, DeleteRouter)
+        table_actions = (CreateRouter, DeleteRouter,
+                         RoutersFilterAction)
         row_actions = (SetGateway, ClearGateway, EditRouter, DeleteRouter)
diff --git a/openstack_dashboard/dashboards/project/lbaas/tables.py b/openstack_dashboard/dashboards/project/lbaas/tables.py
index 3e89aed..16ac56b 100644
--- a/openstack_dashboard/dashboards/project/lbaas/tables.py
+++ b/openstack_dashboard/dashboards/project/lbaas/tables.py
@@ -165,7 +165,7 @@ class UpdateMonitorLink(policy.PolicyTargetMixin, tables.LinkAction):
     policy_rules = (("network", "update_health_monitor"),)
 
     def get_link_url(self, monitor):
-        base_url = reverse("horizon:project:loadbalancers:updatemonitor",
+        base_url = reverse("horizon:project:lbaas:updatemonitor",
                            kwargs={'monitor_id': monitor.id})
         return base_url
 
diff --git a/openstack_dashboard/dashboards/project/networking_topology/networks/__init__.py b/openstack_dashboard/dashboards/project/networking_topology/networks/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/openstack_dashboard/dashboards/project/networking_topology/networks/tables.py b/openstack_dashboard/dashboards/project/networking_topology/networks/tables.py
new file mode 100644
index 0000000..04cf858
--- /dev/null
+++ b/openstack_dashboard/dashboards/project/networking_topology/networks/tables.py
@@ -0,0 +1,29 @@
+# Copyright 2015 Cisco Systems.
+#
+#    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.
+
+from django.utils.translation import ugettext_lazy as _
+
+from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking import tables
+
+
+class DeleteNetwork(tables.DeleteNetwork):
+    redirect_url = "horizon:project:networking_topology:network"
+
+
+class NetworksTable(tables.NetworksTable):
+    class Meta(object):
+        name = "networks"
+        verbose_name = _("Networks")
+        table_actions = (DeleteNetwork,)
+        row_actions = (DeleteNetwork,)
diff --git a/openstack_dashboard/dashboards/project/networking_topology/subnets/__init__.py b/openstack_dashboard/dashboards/project/networking_topology/subnets/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/openstack_dashboard/dashboards/project/networking_topology/subnets/tables.py b/openstack_dashboard/dashboards/project/networking_topology/subnets/tables.py
new file mode 100644
index 0000000..7ef13f4
--- /dev/null
+++ b/openstack_dashboard/dashboards/project/networking_topology/subnets/tables.py
@@ -0,0 +1,30 @@
+# Copyright 2015 Cisco Systems.
+#
+#    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.
+
+
+from django.utils.translation import ugettext_lazy as _
+
+from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking.subnets import tables
+
+
+class DeleteSubnet(tables.DeleteSubnet):
+    failure_url = 'horizon:project:networking_topology:network'
+
+
+class SubnetsTable(tables.SubnetsTable):
+    class Meta(object):
+        name = "subnets"
+        verbose_name = _("Subnets")
+        row_actions = (DeleteSubnet, )
+        table_actions = (DeleteSubnet, )
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_container.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_container.html
index 8077cd3..35f6771 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_container.html
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_container.html
@@ -22,10 +22,11 @@
             [[/console_id]]
         {% endif %}
       </div>
-      <a class="add-interface btn btn-primary btn-xs ajax-modal [[type]]" href="[[add_interface_url]]">[[add_interface_label]]</a>
+      [[#type]]
       <div class="cell delete">
         <button class="delete-device btn btn-danger btn-xs [[type]]" data-type="[[type]]"  data-device-id="[[id]]">[[delete_label]]</button>
       </div>
+      [[/type]]
     </div>
   </div>
 </div>
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_instance.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_instance.html
new file mode 100644
index 0000000..84ecd62
--- /dev/null
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_instance.html
@@ -0,0 +1,23 @@
+{% extends "horizon/client_side/template.html" %}
+{% load horizon %}
+
+{% block id %}balloon_instance{% endblock %}
+
+{% block template %}
+{% jstemplate %}
+<div class="portTableHeader">
+  <div class="title">[[ips_label]]</div>
+</div>
+<table class="detailInfoTable">
+  <caption></caption>
+  <tbody>
+    [[#ips]]
+    <tr>
+      <th>[[ip_address]]</th>
+      <td>[[subnet_id]]</td>
+    </tr>
+    [[/ips]]
+  </tbody>
+</table>
+{% endjstemplate %}
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_net.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_net.html
new file mode 100644
index 0000000..c4d17a5
--- /dev/null
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_net.html
@@ -0,0 +1,38 @@
+{% extends "horizon/client_side/template.html" %}
+{% load horizon %}
+
+{% block id %}balloon_net{% endblock %}
+
+{% block template %}
+{% jstemplate %}
+<div class="portTableHeader">
+  <div class="title">[[subnets_label]]</div>
+  <div class="action">
+    <a class="add-subnet btn btn-default btn-xs ajax-modal [[type]]" href="[[add_subnet_url]]">
+      <span class="fa fa-plus"></span>
+      [[add_subnet_label]]
+    </a>
+  </div>
+</div>
+<table class="detailInfoTable">
+  <caption></caption>
+  <tbody>
+    [[#subnet]]
+    <tr>
+      <th>
+        <span title="[[id]]">
+          <a href="[[url]]">[[id]]</a>
+        </span>
+      </th>
+      <td>[[cidr]]</td>
+      <td class="delete">
+        <button class="delete-port btn btn-danger btn-xs"
+          data-router-id="[[router_id]]" data-network-id="[[network_id]]"
+          data-port-id="[[id]]">[[delete_subnet_label]]</button>
+      </td>
+    </tr>
+    [[/subnet]]
+  </tbody>
+</table>
+{% endjstemplate %}
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_port.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_port.html
index 1f4a7c7..e30caee 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_port.html
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/client_side/_balloon_port.html
@@ -5,8 +5,17 @@
 
 {% block template %}
 {% jstemplate %}
+<div class="portTableHeader">
+  <div class="title">[[interfaces_label]]</div>
+  <div class="action">
+    <a class="add-interface btn btn-default btn-xs ajax-modal [[type]]" href="[[add_interface_url]]">
+      <span class="fa fa-plus"></span>
+      [[add_interface_label]]
+    </a>
+  </div>
+</div>
 <table class="detailInfoTable">
-  <caption>[[interfaces_label]]</caption>
+  <caption></caption>
   <tbody>
     [[#port]]
     <tr>
@@ -22,7 +31,9 @@
       </td>
       <td class="delete">
         [[#is_interface]]
-        <button class="delete-port btn btn-danger btn-xs" data-router-id="[[router_id]]"  data-port-id="[[id]]">[[delete_interface_label]]</button>
+        <button class="delete-port btn btn-danger btn-xs"
+          data-router-id="[[router_id]]" data-network-id="[[network_id]]"
+          data-port-id="[[id]]">[[delete_interface_label]]</button>
         [[/is_interface]]
       </td>
     </tr>
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/create_router.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/create_router.html
index 352e1dd..620a465 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/create_router.html
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/create_router.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Create Router" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Create a Router") %}
-{% endblock page_header %}
-
 {% block main %}
     {% include 'project/networking_topology/_create_router.html' %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/iframe.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/iframe.html
index 9915d38..650aaf0 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/iframe.html
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/iframe.html
@@ -1,3 +1,5 @@
+{% load firstof from future %}
+
 <!DOCTYPE html>
 <html>
   <head>
@@ -6,7 +8,7 @@
   </head>
   <body>
     {% include "horizon/_messages.html" %}
-    {% firstof  table.render  interfaces_table.render tab_group.render%}
+    {% firstof subnets_table.render table.render interfaces_table.render tab_group.render %}
     {% include "project/networking_topology/_post_massage.html" %}
   </body>
 </html>
diff --git a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/index.html b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/index.html
index 1dd4c78..30d137d 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/index.html
+++ b/openstack_dashboard/dashboards/project/networking_topology/templates/networking_topology/index.html
@@ -3,10 +3,6 @@
 {% load url from future %}
 {% block title %}{% trans "Network Topology" %}{% endblock %}
 
-{% block page_header %}
-  {% include "horizon/common/_page_header.html" with title=_("Network Topology") %}
-{% endblock page_header %}
-
 {% block main %}
 
 <noscript>
@@ -16,38 +12,53 @@
 {% include "project/networking_topology/client_side/_balloon_container.html" %}
 {% include "project/networking_topology/client_side/_balloon_device.html" %}
 {% include "project/networking_topology/client_side/_balloon_port.html" %}
-
-<script type="text/javascript" src="/static/dashboard/js/contrail.networktopology.js"></script>
-
+{% include "project/networking_topology/client_side/_balloon_net.html" %}
+{% include "project/networking_topology/client_side/_balloon_instance.html" %}
+<div class='description'>
+  {% blocktrans %}
+Resize the canvas by scrolling up/down with your mouse/trackpad on the topology.
+Pan around the canvas by clicking and dragging the space behind the topology.
+  {% endblocktrans %}
+</div>
 <div class="topologyNavi">
   <div class="toggleView btn-group" data-toggle="buttons-radio">
-    <button type="button" class="btn small" data-value="small"><i class="icon-th"></i>{%trans "Small" %}</button>
-    <button type="button" class="btn normal" data-value="normal"><i class="icon-th-large"></i>{%trans "Normal" %}</button>
+    <button type="button" class="btn btn-default" id="toggle_labels"><span class="fa
+        fa-th-large"></span> {%trans "Toggle labels" %}</button>
+    <button type="button" class="btn btn-default" id="toggle_networks"><span class="fa
+        fa-th"></span> {%trans "Toggle Network Collapse" %}</button>
   </div>
-
   <div class="launchButtons">
   {% if launch_instance_allowed %}
-  <a href="{% url 'horizon:project:networking_topology:launchinstance' %}" id="instances__action_launch" class="btn btn-default btn-sm btn-launch ajax-modal"><span class="glyphicon glyphicon-cloud-upload"></span> {%trans "Launch Instance" %}</a>
+  {% if show_ng_launch %}
+  {% url 'horizon:project:networking_topology:index' as networkUrl %}
+  <a href="javascript:void(0);" ng-controller="LaunchInstanceModalController as modal" ng-click="modal.openLaunchInstanceWizard({successUrl: '{{networkUrl}}'})" id="instances__action_launch-ng" class="btn btn-default btn-sm btn-launch {% if instance_quota_exceeded %}disabled{% endif %}"><span class="fa fa-cloud-upload"></span> {% if instance_quota_exceeded %}{% trans "Launch Instance (Quota exceeded)"%}{% else %}{% trans "Launch Instance"%}{% endif %}</a>
+  {% endif %}
+  {% if show_legacy_launch %}
+  <a href="{% url 'horizon:project:networking_topology:launchinstance' %}" id="instances__action_launch" class="btn btn-default btn-sm btn-launch ajax-modal {% if instance_quota_exceeded %}disabled{% endif %}"><span class="fa fa-cloud-upload"></span> {% if instance_quota_exceeded %}{% trans "Launch Instance (Quota exceeded)"%}{% else %}{% trans "Launch Instance"%}{% endif %}</a>
+  {% endif %}
   {% endif %}
   {% if create_network_allowed %}
-  <a href="{% url 'horizon:project:networking_topology:createnetwork' %}" id="networks__action_create" class="btn btn-default btn-sm ajax-modal"><span class="glyphicon glyphicon-plus"></span> {%trans "Create Network" %}</a>
+      <a href="{% url 'horizon:project:networking_topology:createnetwork' %}" id="networks__action_create" class="btn btn-default btn-sm ajax-modal {% if network_quota_exceeded %}disabled{% endif %}"><span class="fa fa-plus"></span> {% if network_quota_exceeded %}{% trans "Create Network (Quota exceeded)"%}{% else %}{% trans "Create Network"%}{% endif %}</a>
   {% endif %}
   {% if create_router_allowed %}
-  <a href="{% url 'horizon:project:networking_topology:createrouter' %}" id="Routers__action_create" class="btn btn-default btn-sm ajax-modal"><span class="glyphicon glyphicon-plus"></span> {%trans "Create Router" %}</a>
+      <a href="{% url 'horizon:project:networking_topology:createrouter' %}" id="Routers__action_create" class="btn btn-default btn-sm ajax-modal {% if router_quota_exceeded %}disabled{% endif %}"><span class="fa fa-plus"></span> {% if router_quota_exceeded %}{% trans "Create Router (Quota exceeded)"%}{% else %}{% trans "Create Router"%}{% endif %}</a>
   {% endif %}
   </div>
 </div>
 
 <div id="topologyCanvasContainer">
   <div class="nodata">{% blocktrans %}There are no networks, routers, or connected instances to display.{% endblocktrans %}</div>
-  {% include "project/networking_topology/_svg_element.html" %}
 </div>
-<span data-networktopology="{% url 'horizon:project:networking_topology:json' %}" id="contrailnetworktopology"></span>
+<span data-networktopology="{% url 'horizon:project:networking_topology:json' %}" id="networktopology"></span>
 <div id="topologyMessages"></div>
 
 <script type="text/javascript">
-  window.onload=function() {
-      contrail.network_topology.init();
+  if (typeof horizon.network_topology !== 'undefined') {
+    horizon.network_topology.init();
+  } else {
+    addHorizonLoadEvent(function () {
+      horizon.network_topology.init();
+    });
   }
 </script>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networking_topology/urls.py b/openstack_dashboard/dashboards/project/networking_topology/urls.py
index 9b35b3f..2dc968a 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/urls.py
+++ b/openstack_dashboard/dashboards/project/networking_topology/urls.py
@@ -27,9 +27,16 @@
     'contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking_topology.views',
     url(r'^$', views.NetworkTopologyView.as_view(), name='index'),
     url(r'^router$', views.RouterView.as_view(), name='router'),
+    url(r'^network$', views.NetworkView.as_view(), name='network'),
     url(r'^instance$', views.InstanceView.as_view(), name='instance'),
     url(r'^router/(?P<router_id>[^/]+)/$', views.RouterDetailView.as_view(),
         name='detail'),
+    url(r'^router/(?P<router_id>[^/]+)/addinterface$',
+        views.NTAddInterfaceView.as_view(), name='interface'),
+    url(r'^network/(?P<network_id>[^/]+)/$', views.NetworkDetailView.as_view(),
+        name='detail'),
+    url(r'^network/(?P<network_id>[^/]+)/subnet/create$',
+        views.NTCreateSubnetView.as_view(), name='subnet'),
     url(r'^json$', views.JSONView.as_view(), name='json'),
     url(r'^launchinstance$', views.NTLaunchInstanceView.as_view(),
         name='launchinstance'),
diff --git a/openstack_dashboard/dashboards/project/networking_topology/views.py b/openstack_dashboard/dashboards/project/networking_topology/views.py
index 2067aab..66de876 100644
--- a/openstack_dashboard/dashboards/project/networking_topology/views.py
+++ b/openstack_dashboard/dashboards/project/networking_topology/views.py
@@ -22,30 +22,57 @@
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponse  # noqa
-from django.views.generic import TemplateView  # noqa
+from django.utils.translation import ugettext_lazy as _
 from django.views.generic import View  # noqa
 
+from horizon import exceptions
+from horizon import views
+
 from openstack_dashboard import api
+from openstack_dashboard.usage import quotas
 
 from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking_topology.instances \
     import tables as instances_tables
+from openstack_dashboard.dashboards.project.network_topology.networks \
+    import tables as networks_tables
 from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking_topology.ports \
     import tables as ports_tables
 from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking_topology.routers \
     import tables as routers_tables
+from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking_topology.subnets \
+    import tables as subnets_tables
 
 from openstack_dashboard.dashboards.project.instances import\
     views as i_views
 from openstack_dashboard.dashboards.project.instances.workflows import\
     create_instance as i_workflows
+from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking.subnets import\
+    views as s_views
+from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking.subnets import\
+    workflows as s_workflows
 from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking import\
     views as n_views
 from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.networking import\
     workflows as n_workflows
+from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.l3routers.ports import\
+    views as p_views
 from contrail_openstack_dashboard.openstack_dashboard.dashboards.project.l3routers import\
     views as r_views
 
 
+class NTAddInterfaceView(p_views.AddInterfaceView):
+    success_url = "horizon:project:networking_topology:index"
+    failure_url = "horizon:project:networking_topology:index"
+
+    def get_success_url(self):
+        return reverse("horizon:project:networking_topology:index")
+
+    def get_context_data(self, **kwargs):
+        context = super(NTAddInterfaceView, self).get_context_data(**kwargs)
+        context['form_url'] = 'horizon:project:networking_topology:interface'
+        return context
+
+
 class NTCreateRouterView(r_views.CreateView):
     template_name = 'project/networking_topology/create_router.html'
     success_url = reverse_lazy("horizon:project:networking_topology:index")
@@ -71,6 +98,18 @@ class NTLaunchInstanceView(i_views.LaunchInstanceView):
     workflow_class = NTLaunchInstance
 
 
+class NTCreateSubnet(s_workflows.CreateSubnet):
+    def get_success_url(self):
+        return reverse("horizon:project:networking_topology:index")
+
+    def get_failure_url(self):
+        return reverse("horizon:project:networking_topology:index")
+
+
+class NTCreateSubnetView(s_views.CreateView):
+    workflow_class = NTCreateSubnet
+
+
 class InstanceView(i_views.IndexView):
     table_class = instances_tables.InstancesTable
     template_name = 'project/networking_topology/iframe.html'
@@ -81,6 +120,11 @@ class RouterView(r_views.IndexView):
     template_name = 'project/networking_topology/iframe.html'
 
 
+class NetworkView(n_views.IndexView):
+    table_class = networks_tables.NetworksTable
+    template_name = 'project/networking_topology/iframe.html'
+
+
 class RouterDetailView(r_views.DetailView):
     table_classes = (ports_tables.PortsTable, )
     template_name = 'project/networking_topology/iframe.html'
@@ -89,8 +133,14 @@ def get_interfaces_data(self):
         pass
 
 
-class NetworkTopologyView(TemplateView):
+class NetworkDetailView(n_views.DetailView):
+    table_classes = (subnets_tables.SubnetsTable, )
+    template_name = 'project/networking_topology/iframe.html'
+
+
+class NetworkTopologyView(views.HorizonTemplateView):
     template_name = 'project/networking_topology/index.html'
+    page_title = _("Network Topology")
 
     def _has_permission(self, policy):
         has_permission = True
@@ -101,19 +151,31 @@ def _has_permission(self, policy):
 
         return has_permission
 
+    def _quota_exceeded(self, quota):
+        usages = quotas.tenant_quota_usages(self.request)
+        available = usages.get(quota, {}).get('available', 1)
+        return available <= 0
+
     def get_context_data(self, **kwargs):
         context = super(NetworkTopologyView, self).get_context_data(**kwargs)
         network_config = getattr(settings, 'OPENSTACK_NEUTRON_NETWORK', {})
 
         context['launch_instance_allowed'] = self._has_permission(
             (("compute", "compute:create"),))
+        context['instance_quota_exceeded'] = self._quota_exceeded('instances')
         context['create_network_allowed'] = self._has_permission(
             (("network", "create_network"),))
+        context['network_quota_exceeded'] = self._quota_exceeded('networks')
         context['create_router_allowed'] = (
             network_config.get('enable_router', True) and
             self._has_permission((("network", "create_router"),)))
+        context['router_quota_exceeded'] = self._quota_exceeded('routers')
         context['console_type'] = getattr(
             settings, 'CONSOLE_TYPE', 'AUTO')
+        context['show_ng_launch'] = getattr(
+            settings, 'LAUNCH_INSTANCE_NG_ENABLED', False)
+        context['show_legacy_launch'] = getattr(
+            settings, 'LAUNCH_INSTANCE_LEGACY_ENABLED', True)
         return context
 
 
@@ -170,14 +232,18 @@ def _get_networks(self, request):
                 request.user.tenant_id)
         except Exception:
             neutron_networks = []
-        networks = [{'name': network.name,
-                     'id': network.id,
-                     'subnets': [{'cidr': subnet.cidr}
-                                 for subnet in network.subnets],
-                     'router:external': network['router:external']}
-                    for network in neutron_networks]
-        self.add_resource_url('horizon:project:networking:detail',
-                              networks)
+        networks = []
+        for network in neutron_networks:
+            obj = {'name': network.name_or_id,
+                   'id': network.id,
+                   'subnets': [{'id': subnet.id,
+                                'cidr': subnet.cidr}
+                               for subnet in network.subnets],
+                   'status': network.status,
+                   'router:external': network['router:external']}
+            self.add_resource_url('horizon:project:networking:subnets:detail',
+                                  obj['subnets'])
+            networks.append(obj)
 
         # Add public networks to the networks list
         if self.is_router_enabled:
@@ -192,16 +258,25 @@ def _get_networks(self, request):
                 if publicnet.id in my_network_ids:
                     continue
                 try:
-                    subnets = [{'cidr': subnet.cidr}
-                               for subnet in publicnet.subnets]
+                    subnets = []
+                    for subnet in publicnet.subnets:
+                        snet = {'id': subnet.id,
+                                'cidr': subnet.cidr}
+                        self.add_resource_url(
+                            'horizon:project:networking:subnets:detail', snet)
+                        subnets.append(snet)
                 except Exception:
                     subnets = []
                 networks.append({
-                    'name': publicnet.name,
+                    'name': publicnet.name_or_id,
                     'id': publicnet.id,
                     'subnets': subnets,
+                    'status': publicnet.status,
                     'router:external': publicnet['router:external']})
 
+        self.add_resource_url('horizon:project:networking:detail',
+                              networks)
+
         return sorted(networks,
                       key=lambda x: x.get('router:external'),
                       reverse=True)
@@ -217,7 +292,7 @@ def _get_routers(self, request):
             neutron_routers = []
 
         routers = [{'id': router.id,
-                    'name': router.name,
+                    'name': router.name_or_id,
                     'status': router.status,
                     'external_gateway_info': router.external_gateway_info}
             for router in neutron_routers]
@@ -236,7 +311,8 @@ def _get_ports(self, request):
                   'fixed_ips': port.fixed_ips,
                   'device_owner': port.device_owner,
                   'status': port.status}
-                 for port in neutron_ports]
+                 for port in neutron_ports
+                 if port.device_owner != 'networking:router_ha_interface']
         self.add_resource_url('horizon:project:networking:ports:detail',
                               ports)
         return ports