diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index c902f1980..170ec67cb 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -1,49 +1,77 @@
+{% load static url_helpers %}
+
- {{ title }}
-
- Conatct {{forloop.counter}}
-
-
- {% for item in value %}
-
{{ value | first }}
- {% else %} -- {{ value }} -
- {% endif %} - ++ {{ title }} +
+ {% if address %} + {% include "includes/organization_address.html" with organization=value %} + {% elif contact %} + {% if list %} + {% if value|length == 1 %} + {% include "includes/contact.html" with contact=value|first %} + {% else %} ++ Conatct {{forloop.counter}} +
+ {% include "includes/contact.html" with contact=item %}{{ value | first }}
+ {% else %} +{{ user.email }} ({{ value.first.role }})
+ {% else %} ++ {{ value }} +
+ {% endif %} +