diff --git a/src/cloud/backend.c4 b/src/cloud/backend.c4
index 914d3e3..e716b65 100644
--- a/src/cloud/backend.c4
+++ b/src/cloud/backend.c4
@@ -2,9 +2,10 @@
 model {
 
   extend aws {
-    pg = database 'PostgreSQL' {
+    pg = database 'PostgreSQL' {      
       technology 'AWS Aurora PostgreSQL'
       description 'Database for storing relational data'
+      link https://aws.amazon.com/rds/postgresql/
       style {
         icon https://icons.terrastruct.com/dev%2Fpostgresql.svg
       }
@@ -66,19 +67,22 @@ views {
     title 'Databases'
     include
       *,
-      aws,
+      aws with {
+        title 'AWS - PostgreSQL'
+      },
       cloud,
-      cloud.* -> aws.pg
+      cloud.* -> pg.*
+    exclude pg
 
     style * {
       color secondary
     }
 
-    style cloud, aws, aws.pg  {
+    style cloud, aws  {
       color muted
     }
 
-    style aws.pg.* {
+    style pg.* {
       color green
     }
   }
diff --git a/src/cloud/ui.c4 b/src/cloud/ui.c4
index 5344054..49a6735 100644
--- a/src/cloud/ui.c4
+++ b/src/cloud/ui.c4
@@ -13,6 +13,8 @@ model {
     mobile = mobile 'Mobile App' {
       technology 'Flutter'
       description 'The mobile app of the cloud system'
+      link https://flutter.dev/
+      
       -> cloud.backend.graphql 'fetches data'
       -> aws.cognito 'authenticates'
     }
@@ -26,12 +28,13 @@ model {
 views {
 
   view cloud_ui of cloud.ui {
-
     include
       *,
       cloud,
       aws,
       cloud.ui -> aws.*
+    exclude
+      cloud.ui
 
     style * {
       color secondary
@@ -41,7 +44,7 @@ views {
       color muted
     }
 
-    style cloud.ui, cloud.ui.* {
+    style cloud.ui.* {
       color green
     }
   }
diff --git a/src/model.c4 b/src/model.c4
index b4e29d1..ac5c024 100644
--- a/src/model.c4
+++ b/src/model.c4
@@ -4,7 +4,8 @@ model {
     description 'Customer of the cloud system'
   }
 
-  cloud = system 'Cloud System' {
+  cloud = system 'Cloud System' {    
+    link https://likec4.dev
     description '
       Our SaaS platfrom that allows
       customers to interact with
@@ -18,7 +19,8 @@ model {
       }
     }
 
-    backend = component 'Backend' {
+    backend = component 'Backend' {      
+      link https://github.com/likec4/likec4
       description 'The backend services of the cloud system'
     }
 
@@ -28,6 +30,7 @@ model {
   customer -> ui 'uses web and mobile'
 
   aws = system 'Amazon Web Services' {
+    link https://aws.amazon.com/
     description '
       Cloud Infrastructure and
       Managed Services
@@ -38,6 +41,7 @@ model {
     }
 
     cognito = component 'Cognito' {
+      link https://aws.amazon.com/cognito/
       description 'Provides user management and authentication'
     }
   }
diff --git a/src/views.c4 b/src/views.c4
index 10314bf..d54f382 100644
--- a/src/views.c4
+++ b/src/views.c4
@@ -22,6 +22,9 @@ views {
     style aws, cloud {
       color muted
     }
+    style aws.* {
+      color green
+    }
   }
 
-}
\ No newline at end of file
+}