diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index ead69f39..54534c4f 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -58,14 +58,7 @@ class HomeController < ApplicationController
   end
 
   def dashboard
-    # if @employee && @employee.role == "cashier"
-    #
-    # elsif  @employee && @employee.role == "waiter"
-    # elsif  @employee && @employee.role == "administrator"
-    # elsif  @employee && @employee.role == "manager"
-    # elsif  @employee && @employee.role == "supervisour"
-    #   redirect_to dashboard_path
-    # end
+    @shop = Shop.first
   end
 
   def destroy
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index c211b8e6..0883cc92 100644
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -1,18 +1,3 @@
-<div class="row">
-  <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
-    <% if current_login_employee.role == "admin" %>
-
-    <% elsif current_login_employee.role == "cashier" %>
-        <%= link_to "Cashier Station", origami_path %>
-    <% elsif current_login_employee.role == "account" %>
-        <%= link_to "Cashier Station", oishi_path %>
-    <% else %>
-        <%= link_to "Cashier Station", oishi_path %>
-    <% end %>
-    <% shop = Shop.first %>
-  </div>
-</div>
-
 <div class="row">
   <div class="col-md-9 col-lg-9">
       <h4><strong>Role Features</strong></h4>
@@ -203,14 +188,14 @@
   <div class="card">
     <div class="page-header center-text">
      <h4 class="footer-header">
-      <%= shop.name %>
+      <%= @shop.name %>
      </h4>
     </div>
     <div class="center-text">
-      <%= shop.address %>
+      <%= @shop.address %>
     </div>
     <div class="center-text">
-      <%= shop.phone_no %>
+      <%= @shop.phone_no %>
     </div>
   </div>
 </div>