diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 1f93e6aa..8f36bd8f 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,7 +2,7 @@ class HomeController < ApplicationController
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]
 
   def index
-    @employees = Employee.all.order("name asc")
+    @employees = Employee.all_emp_except_waiter.order("name asc")
     @login_form = LoginForm.new()
   end
 
@@ -19,6 +19,8 @@ class HomeController < ApplicationController
 
     if @employee != nil
       session[:session_token] = @employee.token_session
+      #if cashier => already opening cahshier?
+      
       redirect_to origami_root_path
     else
       render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!"
diff --git a/app/models/employee.rb b/app/models/employee.rb
index 69eb3fae..1816c2e3 100644
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -6,6 +6,10 @@ class Employee < ApplicationRecord
   validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true
   validates :password, numericality: true, length: {in: 3..9}, allow_blank: true
 
+  def self.all_emp_except_waiter
+     Employee.where('role!=?','waiter')
+  end
+
   def self.collection
     Employee.select("id, name").map { |e| [e.name, e.id] }
   end
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
index 84b6f199..b9418d22 100644
--- a/app/views/home/show.html.erb
+++ b/app/views/home/show.html.erb
@@ -1,14 +1,24 @@
 <style>
   .pin_pad {
-    width:10rem;
-    height:10rem;
-    text-align: center;
-    vertical-align: middle;
-    line-height: 10rem;
-    margin:2px;
-    margin-top:4px;
-    margin-bottom:4px;
-    font-size:3rem;
+    width: 30%;
+  	height:70px;
+  	line-height:70px;
+  	text-align:center;
+  	background:#54A5AF;
+  	font-size:20px;
+  	color:white;
+  }
+  .bottom{
+  	margin-bottom: 1px;
+  }
+  .left{
+  	margin-left:1px;
+  }
+  .orange{
+  	 background-color:#FF7F50;
+  }
+  .purple {
+  	background-color:#7a62d3;
   }
 </style>
 
@@ -23,21 +33,29 @@
                         <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
                     </div>
                 </div>
-                <div class="content" style="margin:10px; margin-top:0px; text-align:center">
-                  <button class="pin_pad" data-value="1">1</button>
-                  <button class="pin_pad" data-value="2">2</button>
-                  <button class="pin_pad" data-value="3">3</button>
-                  <button class="pin_pad" data-value="4">4</button>
-                  <button class="pin_pad" data-value="5">5</button>
-                  <button class="pin_pad" data-value="6">6</button>
-                  <button class="pin_pad" data-value="7">7</button>
-                  <button class="pin_pad" data-value="8">8</button>
-                  <button class="pin_pad" data-value="9">9</button>
-                  <button class="pin_pad" data-value="CLR">CLR</button>
-                  <button class="pin_pad" data-value="8">0</button>
-                  <button class="pin_pad btn-warning" data-value="ENT">ENT</button>
-
+                <div class="content row" style="padding-left:10px;margin-left:10px; margin-top:0px; text-align:center">
+                  <div class='col-md-12'>
+                  <div class='row bottom'>
+                    <div class="pin_pad " data-value="1">1</div>
+                    <div class="pin_pad left" data-value="2">2</div>
+                    <div class="pin_pad left" data-value="3">3</div>
+                 </div>
+                 <div class='row bottom'>
+                    <div class="pin_pad" data-value="4">4</div>
+                    <div class="pin_pad left" data-value="5">5</div>
+                    <div class="pin_pad left" data-value="6">6</div>
+                 </div>
+                 <div class='row bottom'>
+                  <div class="pin_pad" data-value="7">7</div>
+                  <div class="pin_pad left" data-value="8">8</div>
+                  <div class="pin_pad left" data-value="9">9</div>
                 </div>
+                <div class='row bottom'>
+                  <div class="pin_pad orange" data-value="CLR">CLR</div>
+                  <div class="pin_pad left" data-value="8">0</div>
+                  <div class="pin_pad left purple" data-value="ENT">ENT</div>
+                </div>
+              </div>
                 <div class="footer text-center" style="margin:10px">
 
                 </div>