diff --git a/Pearlception/app/controllers/dashboard_controller.rb b/Pearlception/app/controllers/dashboard_controller.rb
index 047b1ce..02d741b 100644
--- a/Pearlception/app/controllers/dashboard_controller.rb
+++ b/Pearlception/app/controllers/dashboard_controller.rb
@@ -5,6 +5,7 @@ class DashboardController < ApplicationController
       #This is a temporary fix until runs and results models are properly discussed with bobby
         #@results = Result.page(params[:page]).per(5)
         if current_user.admin?
+          puts params
           @results = Hash.new
           names = (Company.pluck :company_name) - ["IVA"]
           names.map!{|tenant| tenant.gsub(/'/,'').gsub(/\s/,'')}
@@ -12,8 +13,14 @@ class DashboardController < ApplicationController
               |name|
 
               Apartment::Tenant.switch!(name.gsub(/'/,'').gsub(/\s/,''))
-              @results[name.gsub(/'/,'').gsub(/\s/,'')] = Run.page(params[:page]).per(5)
+
+              if params[:company] == name 
+                  @results[name.gsub(/'/,'').gsub(/\s/,'')] = {results: Run.page(params[:page]).per(5), active: true, name: name}
+              else
+                  @results[name.gsub(/'/,'').gsub(/\s/,'')] = {results: Run.page(params[:page]).per(5), active: false}
+              end
           end
+          #binding.pry
           Apartment::Tenant.switch!
         else
           @results = Run.page(params[:page]).per(5)
diff --git a/Pearlception/app/views/dashboard/index.html.erb b/Pearlception/app/views/dashboard/index.html.erb
index 46aa466..21783b8 100644
--- a/Pearlception/app/views/dashboard/index.html.erb
+++ b/Pearlception/app/views/dashboard/index.html.erb
@@ -89,15 +89,16 @@
             <h2 class="sub-header">Recent Results From All Companies</h2>
 
             <div class="panel-group" id="accordion">
+                <span hidden><%= @i = 1 %></span>
                 <% ((Company.pluck :company_name) - ["IVA"]).each do |company_name| %>
                     <div class="panel panel-primary">
                       <div class="panel-heading">
                         <h3 class="panel-title text-center">
-                          <a data-toggle="collapse" data-parent="#accordion" href="#collapse1">
+                          <a data-toggle="collapse" data-parent="#accordion" href="#collapse<%="#{@i}"%>">
                           <%= company_name %> </a>
                         </h3>
                       </div>
-                      <div id="collapse1" class="panel-collapse collapse">
+                      <div id="collapse<%="#{@i}"%>" class="panel-collapse collapse <%= (@results[company_name.gsub(/'/,'').gsub(/\s/,'')][:active] && @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:name] == company_name.gsub(/'/,'').gsub(/\s/,'') ) ? "in" : ""%>">
                         <div class="panel-body">
                             <div class="table-responsive panel panel-primary">
                               <table class="table table-striped">
@@ -116,11 +117,12 @@
                                       </thead>
                                   </div>
                                   <div class="panel-body">
+                                      <span hidden><%= Apartment::Tenant.switch!(company_name.gsub(/'/,'').gsub(/\s/,'')) %></span>
                                       <tbody>
-                                          <% @results[company_name.gsub(/'/,'').gsub(/\s/,'')].each_slice(1) do |row| %>
+                                          <% @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:results].each_slice(1) do |row| %>
                                             <tr>
                                                 <% row.each do |result|
-                                                    run = Run.find(result.id) %>
+                                                    run = result#Run.find(result.id) %>
                                                     <!-- run date -->
                                                     <td>
                                                         <%= run.runDate %>
@@ -169,13 +171,14 @@
 
                             <div class="center-block">
                                 <div class="col-sm-6 col-sm-offset-3 panel panel-primary" align="center">
-                                    <%= paginate @results[company_name.gsub(/'/,'').gsub(/\s/,'')] %></br>
-                                    <%= page_entries_info @results[company_name.gsub(/'/,'').gsub(/\s/,'')] %>
+                                    <%= paginate @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:results] , params: {company: company_name.gsub(/'/,'').gsub(/\s/,'')} %></br>
+                                    <%= page_entries_info @results[company_name.gsub(/'/,'').gsub(/\s/,'')][:results] %>
                                 </div>
                             </div>
                         </div>
                       </div>
                     </div>
+                    <span hidden><%= @i = @i + 1%></span>
                 <% end %>
             </div>
           <% else %>