diff --git a/backend/core/management/commands/import_template.py b/backend/core/management/commands/import_template.py
index d055293..20074f8 100644
--- a/backend/core/management/commands/import_template.py
+++ b/backend/core/management/commands/import_template.py
@@ -1,5 +1,6 @@
 import yaml
 from django.core.management.base import BaseCommand
+from django.template import Template, Context
 from backend.core.models import DocumentTemplate
 
 class Command(BaseCommand):
@@ -13,7 +14,6 @@ class Command(BaseCommand):
 
         with open(yaml_file_path, 'r') as file:
             content = file.read()
-            yaml_data = yaml.safe_load(content)
 
         DocumentTemplate.objects.update_or_create(
             name="Default Template",
diff --git a/backend/core/templates/document.html b/backend/core/templates/document.html
index f1ec85c..1fa2cc1 100644
--- a/backend/core/templates/document.html
+++ b/backend/core/templates/document.html
@@ -2,35 +2,13 @@
 
 {% block content %}
 <div class="document-container">
-    <header class="document-header">
-        <h1>{{ organization.name }}</h1>
-        <div class="document-meta">
-            <p>Created: {{ document.created_at|date:"F j, Y" }}</p>
-            <p>Last modified: {{ document.modified_at|date:"F j, Y" }}</p>
-        </div>
-    </header>
-
-    <article class="document-content">
-        {% for segment in segments %}
-            {% if segment.segment_type == 'title' %}
-                <h1 class="document-title">{{ segment.content }}</h1>
-            {% elif segment.segment_type == 'subtitle' %}
-                <h2 class="document-subtitle">{{ segment.content }}</h2>
-            {% elif segment.segment_type == 'h1' %}
-                <h2 class="document-h1">{{ segment.content }}</h2>
-            {% elif segment.segment_type == 'h2' %}
-                <h3 class="document-h2">{{ segment.content }}</h3>
-            {% elif segment.segment_type == 'h3' %}
-                <h4 class="document-h3">{{ segment.content }}</h4>
-            {% elif segment.segment_type == 'quote' %}
-                <blockquote class="document-quote">{{ segment.content }}</blockquote>
-            {% else %}
-                <p class="document-body">{{ segment.content }}</p>
-            {% endif %}
-        {% endfor %}
-    </article>
-</div>
+    {% if error %}
+        <p style="color: red;">{{ error }}</p>
+    {% endif %}
 
+    <div>
+        {{ rendered_html|safe }}
+    </div>
 <style>
     .document-container {
         max-width: 800px;
diff --git a/backend/core/views.py b/backend/core/views.py
index 1eed1e7..aec5d1f 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -2,11 +2,13 @@ import logging
 
 from django.shortcuts import render, redirect , get_object_or_404
 from .forms import OrganizationForm
-from .models import Organization,Document,Risk, DocumentTemplate
+from .models import Organization,Document,Risk, DocumentTemplate,DocumentRiskControl,Control
 from backend.core.utils import get_top_risk
 from django.urls import reverse
 from backend.accounts.utils import send_confirmation_email
 from django.contrib.admin.views.decorators import staff_member_required
+from django.template import Template, Context
+
 
 # @login_required
 # def index(request):
@@ -42,18 +44,50 @@ def signup(request):
 def thankyou(request):
     return render(request, 'thankyou.html')
 
-def document(request, document_id):  
-    print(f"Document ID received: {document_id}")
-    doc = get_object_or_404(Document, id=document_id)
-
-    return render(request, 'document.html', {
-        'document': doc,
-        'organization': doc.organization,
-        'segments': doc.segments.all(),
-    })
-
 @staff_member_required
 def template_preview(request, name):
     template = get_object_or_404(DocumentTemplate, name=name)
     parsed_template = template.to_dict()
-    return render(request, 'template_preview.html', {'template': parsed_template})
\ No newline at end of file
+    return render(request, 'template_preview.html', {'template': parsed_template})
+
+
+def document(request, document_id):
+    document = get_object_or_404(Document, id=document_id)
+    risks = (
+        DocumentRiskControl.objects
+        .filter(document=document)
+        .values('risk', 'risk__risk_name')
+        .distinct()
+    )
+
+    risks_with_controls = []
+
+    for risk_entry in risks:
+        risk = {
+            'id': risk_entry['risk'],
+            'name': risk_entry['risk__risk_name']
+        }
+
+        controls = (
+            DocumentRiskControl.objects
+            .filter(document=document, risk_id=risk['id'])
+            .values('control', 'control__name', 'weight')
+            .distinct()
+        )
+
+        risks_with_controls.append({
+            'risk': risk,
+            'controls': list(controls)
+        })
+
+    template_obj = get_object_or_404(DocumentTemplate, name="Default Template")
+    template_content = template_obj.content 
+
+    django_template = Template(template_content)
+    context = Context({
+        'document': document,
+        'risks_with_controls': risks_with_controls
+    })
+
+    rendered_template = django_template.render(context)
+    return render(request, 'document.html', {'rendered_html': rendered_template})
diff --git a/document_template.yml b/document_template.yml
index a481e90..e10d8e9 100644
--- a/document_template.yml
+++ b/document_template.yml
@@ -1,37 +1,18 @@
-- segment_type: "title"
-  content: "Document Title"
+<h1> {{ document.organization.name }} - Risk Report </h1>
+<p> created at: {{ document.created_at|date:'Y-m-d' }}</p>
 
-- segment_type: "subtitle"
-  content: "Document Subtitle"
-
-- segment_type: "h1"
-  content: "Introduction"
-
-- segment_type: "body"
-  content: "{{ dynamic_intro }}"
-
-- segment_type: "h2"
-  content: "Section 1: Details"
-
-- segment_type: "body"
-  content: |
-    <p>This is a static section with an embedded HTML table:</p>
-    <table>
-      <tr>
-        <th>Header 1</th>
-        <th>Header 2</th>
-      </tr>
-      <tr>
-        <td>Data 1</td>
-        <td>Data 2</td>
-      </tr>
-    </table>
-
-- segment_type: "quote"
-  content: "{{ dynamic_quote }}"
-
-- segment_type: "h3"
-  content: "Subsection 1.1"
-
-- segment_type: "body"
-  content: "{{ dynamic_subsection }}"
+risks:
+  {% for item in risks_with_controls %}
+    <div class="risk">
+      <h3>Risk: {{ item.risk.name }}</h3>
+      <div class="controls">
+        <h4>Mitigating Controls:</h4>
+        {% for control in item.controls %}
+          <div class="control">
+            <span class="name">{{ control.control__name }}</span> -
+            <span class="weight">Weight: {{ control.weight }}</span>
+          </div>
+        {% endfor %}
+      </div>
+    </div>
+  {% endfor %}