diff --git a/ui/src/Environments.js b/ui/src/Environments.js
index f49019f1..d5e7875d 100644
--- a/ui/src/Environments.js
+++ b/ui/src/Environments.js
@@ -3,6 +3,11 @@ import Services from './Services';
 
 const Environments = (props) => {
     const columns = [
+        {
+            name: 'Description',
+            selector: row => row.environment.description,
+            sortable: true,
+        },
         {
             name: 'Host',
             selector: row => row.environment.host,
@@ -13,11 +18,6 @@ const Environments = (props) => {
             selector: row => row.environment.address,
             sortable: true,
         },
-        {
-            name: 'Description',
-            selector: row => row.environment.description,
-            sortable: true,
-        },
         {
             name: 'Identity',
             selector: row => row.environment.zitiIdentityId,
diff --git a/ui/src/Network.js b/ui/src/Network.js
index 664eeac7..2eda4892 100644
--- a/ui/src/Network.js
+++ b/ui/src/Network.js
@@ -3,6 +3,8 @@ import * as metadata from './api/metadata';
 import {useEffect, useLayoutEffect, useRef, useState} from "react";
 import ReactFlow, {isNode, useNodesState} from "react-flow-renderer";
 import dagre from 'dagre';
+import { mdiDesktopClassic, mdiAccessPointNetwork } from '@mdi/js';
+import Icon from "@mdi/react";
 
 const Network = () => {
     const [overview, setOverview] = useState([]);
@@ -53,8 +55,10 @@ function buildGraph(overview) {
         let envId = id
         out.nodes.push({
             id: '' + envId,
-            data: {label: 'Environment: ' + item.environment.zitiIdentityId},
-            position: {x: (id * 25), y: 0},
+            data: { label: <div><Icon path={mdiDesktopClassic} size={0.75} className={"flowNode"}/> { item.environment.description } </div> },
+            position: { x: (id * 25), y: 0 },
+            style: { width: 'fit-content', backgroundColor: '#aaa', color: 'white' },
+            type: 'input',
             draggable: true
         });
         id++
@@ -63,8 +67,10 @@ function buildGraph(overview) {
                 if(item.active) {
                     out.nodes.push({
                         id: '' + id,
-                        data: {label: 'Service: ' + item.zitiServiceId},
+                        data: {label: <div><Icon path={mdiAccessPointNetwork} size={0.75} className={"flowNode"}/> { item.endpoint }</div>},
                         position: {x: (id * 25), y: 0},
+                        style: { width: 'fit-content', backgroundColor: '#9367ef', color: 'white' },
+                        type: 'output',
                         draggable: true
                     })
                     out.edges.push({
diff --git a/ui/src/index.css b/ui/src/index.css
index 0f51afb4..a7580b90 100644
--- a/ui/src/index.css
+++ b/ui/src/index.css
@@ -125,4 +125,8 @@ h1, h2, h3, h4, h5, h6 {
 
 .nested-services {
   padding-left: 10em;
+}
+
+svg.flowNode {
+  vertical-align: middle;
 }
\ No newline at end of file