diff --git a/bemade_documents_portal/views/document_portal_templates.xml b/bemade_documents_portal/views/document_portal_templates.xml
index b78f2db..96e542c 100644
--- a/bemade_documents_portal/views/document_portal_templates.xml
+++ b/bemade_documents_portal/views/document_portal_templates.xml
@@ -32,9 +32,8 @@
                 </t>
             </t>
         </template>
-        <template id="document_portal_template" name="Document Portal Template"
-                  inherit_id="portal.portal_sidebar" primary="True">
-            <xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
+        <template id="document_portal_template" name="Document Portal Template">
+            <t t-call="portal.portal_layout">
                 <t t-set="o_portal_fullwidth_alert"
                    groups="documents.group_documents_user">
                     <t t-call="portal.portal_back_in_edit_mode">
@@ -42,53 +41,50 @@
                            t-value="'/web#model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (document._name, document.id, action.id)"/>
                     </t>
                 </t>
-                <div class="row mt16">
-                    <!-- Sidebar -->
-                    <t t-call="portal.portal_record_sidebar">
-                        <t t-set="classes">col-lg-auto d-print-none</t>
-                        <t t-set="title">
-                            <h2 class="mb-0">
-                                <b>Document Info</b>
-                            </h2>
-                        </t>
-                        <t t-set="entries">
+                <t t-call="portal.portal_record_layout">
+                    <t t-set="card_header">
+                        <div class="row no-gutters">
+                            <h5 class="mb-1 mb-md-0">
+                                <span t-field="document.name"/>
+                            </h5>
+                        </div>
+                    </t>
+                    <t t-set="card_body">
+                        <!-- Main Document Contents -->
+                        <div id="document_content"
+                             class="col-12 col-lg justify-content-end w-100 h-100">
+                            <div t-if="document.attachment_type == 'image'"
+                                 class="o_attachment_preview_img">
+                                <img id="attachment_img"
+                                     class="img img-fluid d-block"
+                                     t-attf-src="/documents/content/{{document.id}}"/>
+                            </div>
+                            <iframe t-if="document.mimetype == 'application/pdf'"
+                                    class="mb48 w-100 min-vh-100"
+                                    t-attf-src="/web/static/lib/pdfjs/web/viewer.html?file=/documents/content/{{document.id}}&amp;filename={{document.name}}"/>
                             <ul class="list-group list-group-flush flex-wrap flex-row flex-lg-column">
                                 <li class="list-group-item flex-grow-1 b-0">
-                                    File name: <t t-esc="document.name"/>
-
-                                </li>
-                                <li class="list-group-item flex-grow-1 b-0">
-                                    <strong class="text-muted">File Type:
-                                        <t t-esc="document.mimetype"/>
-                                    </strong>
+                                    <a class="btn btn-secondary btn-block o_download_btn"
+                                       t-att-href="document.get_portal_url(download=True)">
+                                        Download</a>
                                 </li>
                                 <li class="list-group-item flex-grow-1 b-0">
                                     <strong class="text-muted">File Size:
                                         <t t-call="documents.format_file_size"/>
                                     </strong>
                                 </li>
-                                <li class="list-group-item flex-grow-1 b-0">
-                                    <a class="btn btn-secondary btn-block o_download_btn"
-                                       t-att-href="document.get_portal_url(download=True)">
-                                        Download</a>
-                                </li>
                             </ul>
-                        </t>
-                    </t>
-                    <!-- Main Document Contents -->
-                    <div id="document_content" class="col-12 col-lg justify-content-end">
-                        <div class="card">
-                            <!-- Chatter -->
-                            <div id="document_communication" class="card-body">
-                                <h2>History</h2>
-                                <t t-call="portal.message_thread">
-                                    <t t-set="object" t-value="document"/>
-                                </t>
-                            </div>
                         </div>
-                    </div>
+                    </t>
+                </t>
+                <!-- Chatter -->
+                <div id="document_communication" class="card-body">
+                    <h2>History</h2>
+                    <t t-call="portal.message_thread">
+                        <t t-set="object" t-value="document"/>
+                    </t>
                 </div>
-            </xpath>
+            </t>
         </template>
         <template id="portal_breadcrumbs" inherit_id="portal.portal_breadcrumbs">
             <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">