diff --git a/app/views/branded/plans/_show_details.html.erb b/app/views/branded/plans/_show_details.html.erb
index 2a1b17e..d2e1192 100644
--- a/app/views/branded/plans/_show_details.html.erb
+++ b/app/views/branded/plans/_show_details.html.erb
@@ -1,30 +1,112 @@
-<% meta_fragment = @plan.json_fragment().meta%>
-<% project_fragment = @plan.json_fragment().project%>
-<div class="col-md-12 plan-details">
-  <!-- Tabs content -->
-  <div class="tab-content">
-    <div id="plan_metadata" class="tab-pane in active">
-      <%= render(partial: 'shared/fragments/display', locals: {
-                      fragment: meta_fragment,
-                      schema: meta_fragment.madmp_schema,
-                      classname: "meta"
-            } ) %>
-    </div>
 
-    <div id="plan_project" class="tab-pane in">
-      <%= render(partial: 'shared/fragments/display', locals: {
-                      fragment: project_fragment,
+<% dmp_fragment = @plan.json_fragment() %>
+<% meta_fragment = dmp_fragment.meta%>
+<% project_fragment = dmp_fragment.project%>
+<% anr_projects = Registry.find_by(name: "ANRProjects").registry_values %>
+<% locale = @plan.template.locale %>
+<div class="row">
+  <div class="col-md-12 plan-details">
+    <div class="col-md-12">
+      <div class="heading-button" role="button" data-toggle="collapse"
+            data-parent="sections-accordion"
+            href="#plan_project"
+            aria-expanded="true"
+            aria-controls="plan_project">
+        <div class="panel-heading question-text" role="tab" id="heading-plan-project">
+          <div class="panel-title pull-left">
+            <% FastGettext.with_locale locale do %>
+            <%= _("Project Details") %>
+            <% end %>
+          </div>
+          <i class="fa fa-chevron-down pull-right" aria-hidden="true"></i>
+          <div class="clearfix"></div>
+        </div>
+      </div>
+
+      <div id="plan_project" class="panel-collapse collapse in plan-details-content" role="tabpanel" aria-labelledby="heading-plan-project">
+        <%= hidden_field_tag 'fragment-id', project_fragment.id, class: "fragment-id" %>
+        <div class="panel-body project-form  madmp-fragment"><!-- accordion body -->
+          <% I18n.with_locale locale do %>
+            <%= form_for :madmp_fragment, url: madmp_fragment_path(id: project_fragment.id), 
+                          html: {
+                            method: :put,
+                            'data-autosave': project_fragment.id,
+                            class: "form-answer madmp-fragment", 
+                            id: nil  
+                          } do |f| %>
+            <fieldset aria-labelledby="fragment-fieldset" class="fragment-fieldset">
+              <div class="form-group fragment-<%= project_fragment.id %>" data-fragment-id="<%= project_fragment.id %>" >
+                <%= render(partial: 'shared/dynamic_form/form', locals: { 
+                      f: f,
+                      current_fragment: project_fragment, 
                       schema: project_fragment.madmp_schema,
-                      classname: "project"
-            } ) %>
+                      question_id: nil,
+                      readonly: true,
+                      classname: "project",
+                      template_locale: locale,
+                      form_prefix: nil,
+                      source: "form"
+                    }) %>
+              </div>
+            </fieldset>
+
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+
+      <hr/>
+      <div class="clearfix"></div>
+
+      <div class="heading-button" role="button" data-toggle="collapse"
+            data-parent="sections-accordion"
+            href="#plan_metadata"
+            aria-expanded="false"
+            aria-controls="plan_metadata">
+
+        <div class="panel-heading question-text" role="tab" id="heading-plan-metadata">
+          <div class="panel-title pull-left">
+            <% FastGettext.with_locale locale do %>
+              <%= d_("dmpopidor", "Plan Details") %>
+            <% end %>
+          </div>
+          <i class="fa fa-chevron-right pull-right" aria-hidden="true"></i>
+          <div class="clearfix"></div>
+        </div>
+      </div>
+
+      <div id="plan_metadata" class="panel-collapse collapse plan-details-content" role="tabpanel" aria-labelledby="heading-plan-metadata">
+        <% meta_schema = MadmpSchema.find_by(name: "MetaStandard") %>
+        <%= hidden_field_tag 'fragment-id', project_fragment.id, class: "meta_fragment-id" %>
+        <div class="panel-body madmp-fragment"><!-- accordion body -->
+          <% I18n.with_locale locale do %>
+            <%= form_for :madmp_fragment, url: madmp_fragment_path(id: meta_fragment.id), 
+                          html: {
+                            method: :put,
+                            'data-autosave': meta_fragment.id,
+                            class: "form-answer madmp-fragment", 
+                            id: nil  
+                          } do |f| %>
+              <fieldset aria-labelledby="fragment-fieldset" class="fragment-fieldset">
+                <div class="meta-form form-group fragment-<%= meta_fragment.id %>" data-fragment-id="<%= meta_fragment.id %>" >
+                  <%= render(partial: 'shared/dynamic_form/form', locals: { 
+                        f: f,
+                        current_fragment: meta_fragment, 
+                        schema: meta_fragment.madmp_schema,
+                        question_id: nil,
+                        readonly: true,
+                        classname: "meta",
+                        template_locale: locale,
+                        form_prefix: nil,
+                        source: "form"
+                      }) %>
+                </div>
+              </fieldset>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
     </div>
   </div>
-  <ul class="nav nav-tabs form-tabs">
-    <li class="active">
-      <span data-toggle="tab" data-target="#plan_metadata"><i class="fa fa-arrow-left"></i> <%= _("Plan Metadata") %></span>
-    </li>
-    <li>
-      <span data-toggle="tab" data-target="#plan_project"><i class="fa fa-arrow-left"></i> <%= _("Project Details") %></span>
-    </li>
-  </ul>
-</div>
\ No newline at end of file
+</div>
+<div class="modal fade" id="modal-window" tabindex="-1" role="dialog" aria-labelledby="linkedInformationsModal" aria-hidden="true"></div>
\ No newline at end of file
diff --git a/app/views/branded/shared/dynamic_form/fields/_fragment_select_field.html.erb b/app/views/branded/shared/dynamic_form/fields/_fragment_select_field.html.erb
index 21daed3..e7f62a1 100644
--- a/app/views/branded/shared/dynamic_form/fields/_fragment_select_field.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/_fragment_select_field.html.erb
@@ -49,21 +49,23 @@
   <% end %>
 </div>
 
-<div class="col-md-12 selected-value">
-  <strong><%= d_('dmpopidor', 'Selected value:') %></strong> <span><%= selected_value.to_s %></span>
-  (<%= link_to new_edit_linked_madmp_fragments_url(
-      :fragment_id => selected_value.present? ? selected_value.id : 0000,
-      :parent_id => parent_id, 
-      :schema_id => schema.id,
-      :source => "select-modal",
-      :template_locale => template_locale,
-      :query_id => query_id
-    ), {
-      :remote => true, 
-      :target => "_self",
-      'data-toggle' => 'modal', 
-      'data-target' => '#modal-window'
-    } do %>
-      <%= _('Edit') %>
-    <% end %>)
-</div>
\ No newline at end of file
+<% unless readonly %>
+  <div class="col-md-12 selected-value">
+    <strong><%= d_('dmpopidor', 'Selected value:') %></strong> <span><%= selected_value.to_s %></span>
+    (<%= link_to new_edit_linked_madmp_fragments_url(
+        :fragment_id => selected_value.present? ? selected_value.id : 0000,
+        :parent_id => parent_id, 
+        :schema_id => schema.id,
+        :source => "select-modal",
+        :template_locale => template_locale,
+        :query_id => query_id
+      ), {
+        :remote => true, 
+        :target => "_self",
+        'data-toggle' => 'modal', 
+        'data-target' => '#modal-window'
+      } do %>
+        <%= _('Edit') %>
+      <% end %>)
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/branded/shared/dynamic_form/fields/registry/_multiple_complex.html.erb b/app/views/branded/shared/dynamic_form/fields/registry/_multiple_complex.html.erb
index f7e140b..6291af6 100644
--- a/app/views/branded/shared/dynamic_form/fields/registry/_multiple_complex.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/registry/_multiple_complex.html.erb
@@ -15,47 +15,49 @@
         data-schema-id="<%= schema_id %>"
         data-readonly="<%= !overridable %>"
   >
-    <span class="intermediate-label"><i><%= intermediate_message %></i></span>
-    <div class="col-md-12 dynamic-field linked-fragments-select">
-      <%= select_tag "#{f.object_name}[#{field_name}]",
-                  options_for_select(
-                      select_values.map {|v| [ 
-                              v.to_s(locale), 
-                              select_value(v, locale) 
-                          ] 
-                      }
-                  ),
-                  disabled: readonly,
-                  multiple: false,
-                  include_blank: true,
-                  "data-toggle": "tooltip",
-                  title: ttip,
-                  class: "form-control #{field_class}",
-                  id: field_id  %>
+    <% unless readonly %>
+      <span class="intermediate-label"><i><%= intermediate_message %></i></span>
+      <div class="col-md-12 dynamic-field linked-fragments-select">
+        <%= select_tag "#{f.object_name}[#{field_name}]",
+                    options_for_select(
+                        select_values.map {|v| [ 
+                                v.to_s(locale), 
+                                select_value(v, locale) 
+                            ] 
+                        }
+                    ),
+                    disabled: readonly,
+                    multiple: false,
+                    include_blank: true,
+                    "data-toggle": "tooltip",
+                    title: ttip,
+                    class: "form-control #{field_class}",
+                    id: field_id  %>
 
-      <% if parent_id.present? || overridable %>
-        <span data-toggle="modal" data-target="#modal-window">
-          <%= link_to new_edit_linked_madmp_fragments_url(
-                  nil, 
-                  :parent_id => parent_id, 
-                  :schema_id => schema_id, 
-                  :template_locale => locale,
-                  :source => "list-modal",
-                  :property_name => property_name,
-                  :query_id => query_id
-            ),  {
-              :remote => true, 
-              :target => "_self",
-              :class  => "add-fragment",
-              'data-toggle' =>  "tooltip",
-              'data-original-title' => d_("dmpopidor", "Click here to add a new item")
-          } do %>
-            <i class="fa fa-plus-square"></i>
-          <% end %>
-        </span>
-      <% end %>
-    </div>
-    <span class="message-area"></span>
+        <% if parent_id.present? || overridable %>
+          <span data-toggle="modal" data-target="#modal-window">
+            <%= link_to new_edit_linked_madmp_fragments_url(
+                    nil, 
+                    :parent_id => parent_id, 
+                    :schema_id => schema_id, 
+                    :template_locale => locale,
+                    :source => "list-modal",
+                    :property_name => property_name,
+                    :query_id => query_id
+              ),  {
+                :remote => true, 
+                :target => "_self",
+                :class  => "add-fragment",
+                'data-toggle' =>  "tooltip",
+                'data-original-title' => d_("dmpopidor", "Click here to add a new item")
+            } do %>
+              <i class="fa fa-plus-square"></i>
+            <% end %>
+          </span>
+        <% end %>
+      </div>
+      <span class="message-area"></span>
+    <% end %>
   </div>
   <div class="col-md-12">
     <table class="table table-hover linked-fragments-list <%= property_name %>-list list-<%= query_id %>">
@@ -65,7 +67,7 @@
                 obj_list: value, 
                 parent_id: parent_id,
                 schema_id: schema_id,
-                readonly: !overridable,
+                readonly: readonly || !overridable,
                 deletable: true,
                 template_locale: locale,
                 property_name: property_name,
diff --git a/app/views/branded/shared/dynamic_form/fields/registry/_single_complex.html.erb b/app/views/branded/shared/dynamic_form/fields/registry/_single_complex.html.erb
index c14e254..d95c290 100644
--- a/app/views/branded/shared/dynamic_form/fields/registry/_single_complex.html.erb
+++ b/app/views/branded/shared/dynamic_form/fields/registry/_single_complex.html.erb
@@ -18,49 +18,51 @@
         <span class="intermediate-label"><i><%= intermediate_message unless readonly %></i></span>
       </div>
     <% end %>
-    <div class="col-md-12 dynamic-field select-field single-select">
-      <div class="field-button-combo">
-        <%= select_tag "#{f.object_name}[#{field_name}]",
-                    options_for_select(
-                        select_values.map {|v| [ 
-                                v.to_s(locale), 
-                                select_value(v, locale) 
-                            ] 
-                        }
-                    ),
-                    data: {
-                      "tags" => overridable
-                    },
-                    disabled: readonly,
-                    multiple: false,
-                    include_blank: true,
-                    "data-toggle": "tooltip",
-                    title: ttip,
-                    class: "form-control #{field_class}",
-                    id: field_id  %>
-        <% unless readonly %>
-          <span class="remove-button fa fa-times"></span>
+    <% unless readonly %>
+      <div class="col-md-12 dynamic-field select-field single-select">
+        <div class="field-button-combo">
+          <%= select_tag "#{f.object_name}[#{field_name}]",
+                      options_for_select(
+                          select_values.map {|v| [ 
+                                  v.to_s(locale), 
+                                  select_value(v, locale) 
+                              ] 
+                          }
+                      ),
+                      data: {
+                        "tags" => overridable
+                      },
+                      disabled: readonly,
+                      multiple: false,
+                      include_blank: true,
+                      "data-toggle": "tooltip",
+                      title: ttip,
+                      class: "form-control #{field_class}",
+                      id: field_id  %>
+          <% unless readonly %>
+            <span class="remove-button fa fa-times"></span>
+          <% end %>
+        </div>
+        <% if overridable %>
+          <% 
+            style = 'display: none;'
+            custom_value = nil
+            if value.present? && value.additional_info["custom_value"].present?
+              style = ''
+              custom_value = value.additional_info["custom_value"]
+            end
+          %>
+          <% other_field_name = defined?(form_prefix) ? "#{form_prefix}[#{property_name}_custom]" : "#{property_name}_custom" %>
+          <div class="col-md-12 custom-value" style="<%= style %>">
+            <%= f.label other_field_name, d_("dmpopidor", "Custom value: "), class: 'control-label' %>
+            <%= f.hidden_field other_field_name, 
+                      value: custom_value,
+                      class: "form-control #{field_class}",
+                      id: field_id  %>
+            <span><%= custom_value %></span>
+          </div>
         <% end %>
       </div>
-      <% if overridable %>
-        <% 
-          style = 'display: none;'
-          custom_value = nil
-          if value.present? && value.additional_info["custom_value"].present?
-            style = ''
-            custom_value = value.additional_info["custom_value"]
-          end
-        %>
-        <% other_field_name = defined?(form_prefix) ? "#{form_prefix}[#{property_name}_custom]" : "#{property_name}_custom" %>
-        <div class="col-md-12 custom-value" style="<%= style %>">
-          <%= f.label other_field_name, d_("dmpopidor", "Custom value: "), class: 'control-label' %>
-          <%= f.hidden_field other_field_name, 
-                    value: custom_value,
-                    class: "form-control #{field_class}",
-                    id: field_id  %>
-          <span><%= custom_value %></span>
-        </div>
-      <% end %>
-    </div>
+    <% end %>
   </fieldset>
 </div>
\ No newline at end of file
diff --git a/app/views/branded/shared/dynamic_form/linked_fragment/_list.html.erb b/app/views/branded/shared/dynamic_form/linked_fragment/_list.html.erb
index 22ff7b4..f5aeb9b 100644
--- a/app/views/branded/shared/dynamic_form/linked_fragment/_list.html.erb
+++ b/app/views/branded/shared/dynamic_form/linked_fragment/_list.html.erb
@@ -38,7 +38,7 @@
           <% end %>
         <% end %>
       <% end %>
-      <% if deletable %>
+      <% if deletable && !readonly %>
         <span class="delete fa fa-times" 
           aria-hidden="true"
           data-toggle="tooltip" 
diff --git a/app/views/branded/shared/fragments/_display.html.erb b/app/views/branded/shared/fragments/_display.html.erb
deleted file mode 100644
index 9765c71..0000000
--- a/app/views/branded/shared/fragments/_display.html.erb
+++ /dev/null
@@ -1,68 +0,0 @@
-<% sub_schemas = schema.sub_schemas %>
-<% data = fragment.data unless fragment.nil? %>
-<% dmp_fragments = fragment.present? ? fragment.dmp_fragments() : [] %>
-<% schema_properties = schema.schema["properties"]%>
-<dl class="dl-horizontal fragment-display">
-  <% schema_properties.each do |key, prop| %>
-    <% value = data[key] unless data.nil? %>
-    <% field_name = defined?(form_prefix) ? "#{form_prefix}[#{key}]" : key %>
-    <% case prop['type'] %>
-    <% when 'boolean' %>
-      <dt><%= field_name %></dt>
-      <dd><%= value ? _('Yes') : _('No') %></dd>
-    <% when 'array' %>
-      <% if prop['items']['type'] == 'object' && prop['items']['schema_id'].present? %>
-        <% unless classname == "research_output"%>
-          <%
-            sub_schema = sub_schemas[prop['items']['schema_id']]
-          %>
-          <hr/>
-          <table class="table table-hover">
-            <thead><tr><th><%= field_name.capitalize.pluralize(2) %></th></tr></thead>
-            <tbody>
-              <% unless dmp_fragments.empty? %>
-                <% dmp_fragments.where(madmp_schema_id: sub_schema.id, parent_id: fragment.id).each do |val| %>
-                  <tr><td>
-                    <%= render(partial: 'shared/fragments/display', locals: {
-                            fragment: val,
-                            schema: sub_schema,
-                            classname: sub_schema.classname
-                    } ) %>
-                  </td></tr>
-                <% end %>
-              <% end %>
-            </tbody>
-          </table>
-        <% end %>
-      <% else %>
-        <dl class="dl-horizontal">
-          <dt><%= field_name %></dt>
-          <% value.each do |val| %>
-            <dd><%= val %></dd>
-          <% end %>
-        </dl>
-      <% end %>
-    <% when 'object' %>
-      <% if prop["schema_id"].present?  %>
-        <% unless classname == "research_output" || value.nil? %>
-          <%
-            sub_schema = sub_schemas[prop["schema_id"]]
-            sub_fragment = dmp_fragments.find_by(madmp_schema_id: sub_schema.id, parent_id: fragment.id) unless dmp_fragments.empty?
-          %>
-          <hr/>
-          <p class= "fontsize-h3"><%= field_name.capitalize %></p>
-          <dl class="dl-horizontal sub-fragment">
-            <%= render(partial: 'shared/fragments/display', locals: {
-                            fragment: sub_fragment, #TODO : Implement Person fragments display
-                            schema: sub_schema,
-                            classname: sub_schema.classname
-                  } ) %>
-          </dl>
-        <% end %>
-      <% end %>
-    <% else%>
-      <dt><%= field_name %></dt>
-      <dd><%= value %></dd>
-    <% end %>
-  <% end %>
-</dl>
\ No newline at end of file