diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 3a20fa0..4a45c7a 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,9 +2,10 @@ class HomeController < ApplicationController
     def index
         if user_signed_in?
             if current_user.admin?
-                @file = YAML.load_file(Rails.root.to_s + '/config/caf_text.yml')
-                @objectives = @file["objectives"]
+                # @file = YAML.load_file(Rails.root.to_s + '/config/caf_text.yml')
+                # @objectives = @file["objectives"]
             else
+                #
             end
         end
 
diff --git a/app/views/cafs/_caf.html.erb b/app/views/cafs/_caf.html.erb
index a211f63..7649c0f 100644
--- a/app/views/cafs/_caf.html.erb
+++ b/app/views/cafs/_caf.html.erb
@@ -1,17 +1,32 @@
-<div id="<%= dom_id caf %>">
-  <p>
-    <strong>Company:</strong>
-    <%= caf.company_id %>
-  </p>
+<h1><%= @caf.company.name %></h1>
+<h2><%= @caf.name %></h2>
+<p><%= @caf.description %></p>
 
-  <p>
-    <strong>Name:</strong>
-    <%= caf.name %>
-  </p>
+<% @caf.objectives.each do |objective| %>
+  <h3><%= objective.name %></h3>
+  <p><%= objective.description %></p>
 
-  <p>
-    <strong>Description:</strong>
-    <%= caf.description %>
-  </p>
+  <% objective.principles.each do |principle| %>
+    <h4><%= principle.name %></h4>
+    <p><%= principle.description %></p>
 
-</div>
+    <% principle.subprinciples.each do |subprinciple| %>
+      <h5><%= subprinciple.name %></h5>
+      <p><%= subprinciple.description %></p>
+
+      <table>
+        <tr>
+        <% subprinciple.subprincipleitemgroups.each do |subprincipleitemgroup| %>
+          <td><%= subprincipleitemgroup.kind%></td>
+        <% end %>
+        </tr>
+        <% subprinciple.subprincipleitemgroups.each do |subprincipleitemgroup| %>
+          <td><%= subprincipleitemgroup.condition%></td>
+        <% end %>
+        </tr>
+
+      </table>
+    <% end %>
+
+  <% end %>
+<% end %>
diff --git a/app/views/home/_display_caf.html.erb b/app/views/home/_display_caf.html.erb
new file mode 100644
index 0000000..1634714
--- /dev/null
+++ b/app/views/home/_display_caf.html.erb
@@ -0,0 +1,27 @@
+           <% @objectives.each do |objective| %>
+                <% objective_info = objective["objective"] %>
+                <p><%= objective_info["name"] %> <br/> <%= objective_info["description"] %></p>
+                <% principles = objective_info["principles"] %>
+                <% principles.each do |principle| %>
+                    <% principle_info = principle["principle"] %>
+                    <p><%= principle_info["name"] %><br><%= principle_info["description"]%></p>
+                    <% sub_principles = principle_info["sub-principles"] %>
+                    <% sub_principles.each do |sub_principle| %>
+                        <% sub_principle_info = sub_principle["sub-principle"] %>
+                        <p><%= sub_principle_info["name"]%><br/><%= sub_principle_info["description"]%></p>
+                            <% sub_principle_item_groups = sub_principle_info["subprincipleitemgroups"] %>
+                            <% sub_principle_item_groups.each do |key,value| %>
+                                <% header =  key["subprincipleitemgroup"] %>
+                                <%= header["type"] %> - <%= header["condition"] %><br/>
+                                <% subprincipleitem = header["subprincipleitem"] %>
+                                <% subprincipleitem.each do |subprinciple| %>
+                                    <%= subprinciple %><br/>
+                                <% end %>
+                            <% end %>
+
+                            <%# sub_principle_item_group_info =  sub_principle_item_groups["subprincipleitemgroup"] %>                       <%# sub_prinicple_item_group_info.each do |sub_principle_item_group| %>
+                                <%#= sub_principle_item_group["type"] %> <%#= sub_principle_item_group["condition"] %>
+                            <%# end %>
+                    <% end %>
+                <% end %>
+            <% end %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 88cfba5..f47136b 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -18,7 +18,7 @@ Not Signed in.
                 </ul>
                 <ul>
                 <% company.cafs.each do |caf| %>
-                    <li><%= caf.name %>
+                    <li><%= link_to caf.name, company_caf_path(caf.company_id, caf.id) %>
                 <% end %>
                     <li><%= link_to "Add CAF", new_company_caf_path(company) %></li>
                 </ul>
@@ -27,35 +27,6 @@ Not Signed in.
         <p>
          <%= link_to "Add User" %>
         </p>
-
-            <% @objectives.each do |objective| %>
-                <% objective_info = objective["objective"] %>
-                <p><%= objective_info["name"] %> <br/> <%= objective_info["description"] %></p>
-                <% principles = objective_info["principles"] %>
-                <% principles.each do |principle| %>
-                    <% principle_info = principle["principle"] %>
-                    <p><%= principle_info["name"] %><br><%= principle_info["description"]%></p>
-                    <% sub_principles = principle_info["sub-principles"] %>
-                    <% sub_principles.each do |sub_principle| %>
-                        <% sub_principle_info = sub_principle["sub-principle"] %>
-                        <p><%= sub_principle_info["name"]%><br/><%= sub_principle_info["description"]%></p>
-                            <% sub_principle_item_groups = sub_principle_info["subprincipleitemgroups"] %>
-                            <% sub_principle_item_groups.each do |key,value| %>
-                                <% header =  key["subprincipleitemgroup"] %>
-                                <%= header["type"] %> - <%= header["condition"] %><br/>
-                                <% subprincipleitem = header["subprincipleitem"] %>
-                                <% subprincipleitem.each do |subprinciple| %>
-                                    <%= subprinciple %><br/>
-                                <% end %>
-                            <% end %>
-
-                            <%# sub_principle_item_group_info =  sub_principle_item_groups["subprincipleitemgroup"] %>                       <%# sub_prinicple_item_group_info.each do |sub_principle_item_group| %>
-                                <%#= sub_principle_item_group["type"] %> <%#= sub_principle_item_group["condition"] %>
-                            <%# end %>
-                    <% end %>
-                <% end %>
-            <% end %>
-
     <% end %>
 
     <% if current_user.user? %>