diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 48acf78..f79a9fb 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -47,14 +47,20 @@
 <hr/>
 
 <div id="repository-accordion">
-  <h3>Processing information</h3>
-  <div id="processing_information"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
-
-  <h3>Modules Tree</h3>
-  <div id="module_tree"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
-
-  <h3>Metric Results</h3>
-  <div id="metric_results"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
+  <div id="processing-accordion">
+    <h3>Processing information</h3>
+    <div id="processing_information"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
+  </div>
+
+  <div id="module-accordion">
+    <h3>Modules Tree</h3>
+    <div id="module_tree"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
+  </div>
+  
+  <div id="metric-accordion">
+    <h3>Metric Results</h3>
+    <div id="metric_results"><%= image_tag 'loader.gif' %> Loading data. Please, wait.</div>
+  </div>
 </div>
 <script type="text/javascript">
     $(document).ready(function () {
@@ -63,9 +69,12 @@
 
   //Loads the accordion
   $(function() {
-    $( "#repository-accordion" ).accordion({
-      heightStyle: "content"
+    $( "#repository-accordion > div" ).accordion({
+      heightStyle: "content",
+      collapsible: true,
     });
+    $("#module-accordion").accordion({active: false})
+    $("#metric-accordion").accordion({active: false})
   });
 </script>
 
diff --git a/features/repository/show/repository_info.feature b/features/repository/show/repository_info.feature
index ee05794..4c30123 100644
--- a/features/repository/show/repository_info.feature
+++ b/features/repository/show/repository_info.feature
@@ -36,16 +36,15 @@ Feature: Show Repository
     And I should see "COLLECTING time"
     And I should see "ANALYZING time"
     When I click the "Metric Results" h3
+    And I click the "Modules Tree" h3
     Then I should see "Metric"
     And I should see "Value"
     And I should see "Weight"
     And I should see "Threshold"
-    When I click the "Modules Tree" h3
-    Then I should see "Name"
+    And I should see "Name"
     And I should see "Granularity"
     And I should see "Grade"
-    When I click the "Processing information" h3
-    And I click the Reprocess link
+    When I click the Reprocess link
     Then I should see "LOADING"
 
   @kalibro_restart @javascript
--
libgit2 0.21.2