diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4aabe81b..77370ff9 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -14,6 +14,8 @@
 //   padding-top: 4.5rem;
 // }
 
+
+
 .setting_nav{
 	background-color: #2f5663;
 }
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 328437ca..a50d43a5 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,96 +1,18 @@
-<nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav">
-   <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-     <span class="navbar-toggler-icon"></span>
-   </button>
-   <a class="navbar-brand" href="<%= root_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
-   <div class="collapse navbar-collapse" id="navbarCollapse">
-     <ul class="navbar-nav mr-auto">
-        <li class="navbar-nav mr-auto dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a>
-          <ul class="dropdown-menu">
-              <li><%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Item Sets ", settings_item_sets_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Menu Item Sets ", settings_menu_item_sets_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Commissions",   settings_commissions_path  , :tabindex =>"-1" %></li>
-              <li><%= link_to "Commissioners",   settings_commissioners_path  , :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
-              <hr class="hr_advance" />
-              <li><%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %></li>
-              <li><%= link_to "Products", settings_products_path, :tabindex =>"-1" %></li>
-          </ul>
-        </li>
-
-        <li class="navbar-nav mr-auto dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Transactions</a>
-          <ul class="dropdown-menu">
-            <li><%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %></li>
-             <li><%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %></li>
-          </ul>
-        </li>
-        <li class="navbar-nav mr-auto dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Reports</a>
-          <ul class="dropdown-menu">
-            <li><%= link_to "Daily Sale Report", reports_dailysale_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Sales Item Report", reports_saleitem_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Credit Sale Report", reports_credit_payment_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Void Sale Report", reports_void_sale_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Commission Report", reports_commission_index_path, :tabindex =>"-1" %></li>
-            <li><%= link_to "Stock Check Report", reports_stock_check_index_path, :tabindex =>"-1" %></li>
-          </ul>
-        </li>
-        <li class="navbar-nav mr-auto">
-          <a href="<%= oqs_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;OQS</a>
-        </li>
-        <li class="navbar-nav mr-auto">
-          <a href="<%= origami_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Cashier</a>
-        </li>
-        <li class="navbar-nav mr-auto">
-          <a href="<%= crm_customers_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;CRM</a>
-        </li>
-
-
-     </ul>
-
-   </div>
-   <% if current_login_employee %>
-     <div class="right">
-          <ul class="navbar-nav mr-auto">
-          <%if current_login_employee.role !="waiter" %>
-            <li style="color: #959595"><%= current_login_employee.name %> </li>
-
-            <li style="padding-right:10px;padding-left:10px"> | </li>
-            <li ><%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
-            </li>
-          <%end%>
-          </ul>
-     </div>
-   <% end %>
-
- </nav>
-<style type="text/css">
-        hr.hr_advance {
-          margin-top: 10px !important;
-          margin-bottom: 10px !important;
-        }
-</style>
+<header class="setting_nav">
+	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main_navigation" 			aria-controls="main_navigation" aria-expanded="false" aria-label="Toggle navigation">
+	   <span class="navbar-toggler-icon"></span>
+	</button>
+	<a class="my-brand" href="<%= root_path %>">
+		<img src="<%= Rails.public_path %>/image/logo.png" width="30" height="30" class="d-inline-block align-top" alt="Logo">
+		E-menu
+	</a>	
+</header>
+<nav class="nav navbar navbar-light bg-light hidden-md-down">		
+	<div class="collapse navbar-collapse" id="main_navigation">
+		<ul class="navbar-nav">
+			<li class="nav-item">
+				<%= link_to "Order Station", oqs_root_path, :tabindex =>"-1" %>
+			</li>
+		</ul>
+	</div>
+</nav>
\ No newline at end of file