diff --git a/catalog/common-types/nginx.bom b/catalog/common-types/nginx.bom
index 486b9da..6b57633 100644
--- a/catalog/common-types/nginx.bom
+++ b/catalog/common-types/nginx.bom
@@ -52,7 +52,7 @@ brooklyn.catalog:
           dontRequireTtyForSudo: true
           start.timeout: 20m
           sshMonitoring.enabled: false
-          app.port: 8080
+          app.port: 80
           
           shell.env:
             APP_PORT: $brooklyn:config("app.port")
diff --git a/catalog/common-types/tomcat9.bom b/catalog/common-types/tomcat9.bom
index a704563..ef97ecd 100644
--- a/catalog/common-types/tomcat9.bom
+++ b/catalog/common-types/tomcat9.bom
@@ -176,7 +176,16 @@ brooklyn.catalog:
               enricher.targetSensor: $brooklyn:sensor("main.uri")
               enricher.targetValue:
                 $brooklyn:formatString:
-                  - "http://%s:%s"
-                  - $brooklyn:attributeWhenReady("host.name")
-                  - $brooklyn:config("app.port")
+                - "http://%s:%s"
+                - $brooklyn:attributeWhenReady("host.name")
+                - $brooklyn:config("app.port")
+          - type: org.apache.brooklyn.enricher.stock.Transformer
+            brooklyn.config:
+              enricher.sourceSensor: $brooklyn:sensor("host.name")
+              enricher.targetSensor: $brooklyn:sensor("main.page.url")
+              enricher.targetValue:
+                $brooklyn:formatString:
+                - "%s:%s"
+                - $brooklyn:attributeWhenReady("host.name")
+                - $brooklyn:config("app.port")
 
diff --git a/catalog/three-tier-webapp/three-tier-webapp.bom b/catalog/three-tier-webapp/three-tier-webapp.bom
index 1ab1bbb..bdf0f69 100644
--- a/catalog/three-tier-webapp/three-tier-webapp.bom
+++ b/catalog/three-tier-webapp/three-tier-webapp.bom
@@ -26,6 +26,7 @@ brooklyn.catalog:
   items:
   - id: brooklyn-three-tier-webapp
     name: *threeTierWebappName
+    iconUrl: classpath://icons/3tier.png
     description: *threeTierWebappDescription
     itemType: entity
     item:
@@ -71,7 +72,7 @@ brooklyn.catalog:
             transformation: average
         - type: org.apache.brooklyn.enricher.stock.Aggregator
           brooklyn.config:
-            enricher.sourceSensor: $brooklyn:sensor("host.public.address") # not sure about this one
+            enricher.sourceSensor: $brooklyn:sensor("main.page.url")
             enricher.targetSensor: $brooklyn:sensor("addr.list")
             enricher.aggregating.fromMembers: true
         - type: org.apache.brooklyn.enricher.stock.Joiner
@@ -95,11 +96,9 @@ brooklyn.catalog:
         id: nginx
         name: Load Balancer (nginx)
         brooklyn.config:
-          app.port: 8080
-          #loadbalancer.serverpool: $brooklyn:entity("cluster")
+          app.port: 80
           server.list: $brooklyn:entity("cluster").attributeWhenReady("addr.list.string")
           nginx.sticky: false
-          #ssl: $brooklyn:config("ssl")
       - type: org.apache.brooklyn.entity.database.mysql5
         id: db
         name: DB (MySQL)
diff --git a/resources/icons/3tier.png b/resources/icons/3tier.png
new file mode 100644
index 0000000..8c149fe
Binary files /dev/null and b/resources/icons/3tier.png differ