diff --git a/Changes b/Changes
index f662bf1c..d1990918 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,18 @@
+2.038000 - 2017-12-31
+
+  [NEW FEATURES]
+
+  * New implementation of the Network Map (Device Neighbors tab)
+
+  [ENHANCEMENTS]
+
+  * Icon in device ports results to quickly set Manual Toplogy on any port
+  * New host_group_displaynames setting to give friendly aliases to host groups
+
+  [BUG FIXES]
+
+  * tooltips for icons in device ports view now work when paging in results
+
 2.037005 - 2017-12-22
 
   [BUG FIXES]
diff --git a/MANIFEST b/MANIFEST
index 03e9af46..2bcc018e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -38,6 +38,7 @@ lib/App/Netdisco/DB/Result/DeviceRoute.pm
 lib/App/Netdisco/DB/Result/DeviceSkip.pm
 lib/App/Netdisco/DB/Result/DeviceVlan.pm
 lib/App/Netdisco/DB/Result/Log.pm
+lib/App/Netdisco/DB/Result/NetmapPositions.pm
 lib/App/Netdisco/DB/Result/Node.pm
 lib/App/Netdisco/DB/Result/NodeIp.pm
 lib/App/Netdisco/DB/Result/NodeMonitor.pm
@@ -58,6 +59,7 @@ lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm
 lib/App/Netdisco/DB/Result/Virtual/DeviceDnsMismatch.pm
 lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
 lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm
+lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
 lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm
 lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm
 lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm
@@ -233,8 +235,11 @@ META.yml
 share/config.yml
 share/environments/deployment.yml
 share/public/500.html
+share/public/css/awesome-bootstrap-checkbox.css
 share/public/css/bootstrap-tree.css
 share/public/css/bootstrap.min.css
+share/public/css/bootstrap2-toggle.min.css
+share/public/css/d3-force-network-chart.css
 share/public/css/dataTables.bootstrap.css
 share/public/css/daterangepicker-bs2.css
 share/public/css/font-awesome.min.css
@@ -280,6 +285,8 @@ share/public/images/splashyfish_right.png
 share/public/images/tango_sweep.png
 share/public/images/vaga_copy.png
 share/public/javascripts/bootstrap.min.js
+share/public/javascripts/bootstrap2-toggle.min.js
+share/public/javascripts/d3-force-network-chart.js
 share/public/javascripts/d3.min.js
 share/public/javascripts/dataTables.bootstrap.js
 share/public/javascripts/dataTables.ip-address-detect.js
@@ -340,6 +347,7 @@ share/schema_versions/App-Netdisco-DB-41-42-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-42-43-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-43-44-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-44-45-PostgreSQL.sql
+share/schema_versions/App-Netdisco-DB-45-46-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql
@@ -442,6 +450,7 @@ share/views/password.tt
 share/views/plugin.tt
 share/views/report.tt
 share/views/search.tt
+share/views/sidebar/admintask/topology.tt
 share/views/sidebar/device/netmap.tt
 share/views/sidebar/device/ports.tt
 share/views/sidebar/report/generic_report.tt
diff --git a/META.json b/META.json
index e598752b..3695eb1a 100644
--- a/META.json
+++ b/META.json
@@ -105,7 +105,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.037005"
+         "version" : "2.038000"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -127,7 +127,7 @@
       },
       "App::Netdisco::DB" : {
          "file" : "lib/App/Netdisco/DB.pm",
-         "version" : "45"
+         "version" : "46"
       },
       "App::Netdisco::DB::ExplicitLocking" : {
          "file" : "lib/App/Netdisco/DB/ExplicitLocking.pm"
@@ -180,6 +180,9 @@
       "App::Netdisco::DB::Result::Log" : {
          "file" : "lib/App/Netdisco/DB/Result/Log.pm"
       },
+      "App::Netdisco::DB::Result::NetmapPositions" : {
+         "file" : "lib/App/Netdisco/DB/Result/NetmapPositions.pm"
+      },
       "App::Netdisco::DB::Result::Node" : {
          "file" : "lib/App/Netdisco/DB/Result/Node.pm"
       },
@@ -240,6 +243,9 @@
       "App::Netdisco::DB::Result::Virtual::DevicePoeStatus" : {
          "file" : "lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm"
       },
+      "App::Netdisco::DB::Result::Virtual::DevicePortSpeed" : {
+         "file" : "lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm"
+      },
       "App::Netdisco::DB::Result::Virtual::DuplexMismatch" : {
          "file" : "lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm"
       },
@@ -760,6 +766,6 @@
       "x_IRC" : "irc://irc.freenode.org/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.037005",
+   "version" : "2.038000",
    "x_serialization_backend" : "JSON::PP version 2.94"
 }
diff --git a/META.yml b/META.yml
index 9cae4421..8eaf3bb9 100644
--- a/META.yml
+++ b/META.yml
@@ -18,7 +18,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.037005'
+    version: '2.038000'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -33,7 +33,7 @@ provides:
     file: lib/App/Netdisco/Configuration.pm
   App::Netdisco::DB:
     file: lib/App/Netdisco/DB.pm
-    version: '45'
+    version: '46'
   App::Netdisco::DB::ExplicitLocking:
     file: lib/App/Netdisco/DB/ExplicitLocking.pm
   App::Netdisco::DB::Result::Admin:
@@ -68,6 +68,8 @@ provides:
     file: lib/App/Netdisco/DB/Result/DeviceVlan.pm
   App::Netdisco::DB::Result::Log:
     file: lib/App/Netdisco/DB/Result/Log.pm
+  App::Netdisco::DB::Result::NetmapPositions:
+    file: lib/App/Netdisco/DB/Result/NetmapPositions.pm
   App::Netdisco::DB::Result::Node:
     file: lib/App/Netdisco/DB/Result/Node.pm
   App::Netdisco::DB::Result::NodeIp:
@@ -108,6 +110,8 @@ provides:
     file: lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
   App::Netdisco::DB::Result::Virtual::DevicePoeStatus:
     file: lib/App/Netdisco/DB/Result/Virtual/DevicePoeStatus.pm
+  App::Netdisco::DB::Result::Virtual::DevicePortSpeed:
+    file: lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
   App::Netdisco::DB::Result::Virtual::DuplexMismatch:
     file: lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm
   App::Netdisco::DB::Result::Virtual::GenericReport:
@@ -522,5 +526,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/BSD-3-Clause
   repository: https://github.com/netdisco/netdisco
-version: '2.037005'
+version: '2.038000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index fc829e75..2025759f 100644
--- a/lib/App/Netdisco.pm
+++ b/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.037005';
+our $VERSION = '2.038000';
 use App::Netdisco::Configuration;
 
 =head1 NAME