diff --git a/public/viewjs/equipment.js b/public/viewjs/equipment.js
index 88c46f4c..58c7058a 100644
--- a/public/viewjs/equipment.js
+++ b/public/viewjs/equipment.js
@@ -1,9 +1,6 @@
 var equipmentTable = $('#equipment-table').DataTable({
 	'paginate': false,
-	'order': [[1, 'asc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
+	'order': [[0, 'asc']],
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
diff --git a/views/equipment.blade.php b/views/equipment.blade.php
index 10a5be71..04d3a77a 100644
--- a/views/equipment.blade.php
+++ b/views/equipment.blade.php
@@ -18,24 +18,15 @@
 		<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
 		<input type="text" class="form-control" id="search">
 
-		<table id="equipment-table" class="table table-sm table-striped dt-responsive">
+		<table id="equipment-table" class="table table-striped dt-responsive">
 			<thead>
 				<tr>
-					<th>#</th>
 					<th>{{ $L('Name') }}</th>
 				</tr>
 			</thead>
 			<tbody>
 				@foreach($equipment as $equipmentItem)
 				<tr data-equipment-id="{{ $equipmentItem->id }}">
-					<td class="fit-content">
-						<a class="btn btn-info btn-sm" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
-							<i class="fas fa-edit"></i>
-						</a>
-						<a class="btn btn-danger btn-sm equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
-							<i class="fas fa-trash"></i>
-						</a>
-					</td>
 					<td>
 						{{ $equipmentItem->name }}
 					</td>
@@ -58,7 +49,13 @@
 			<div class="tab-pane fade show active" id="instruction-manual-tab">
 				<div id="selectedEquipmentInstructionManualCard" class="card">
 					<div class="card-header">
-						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>
+						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
+						<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
+							<i class="fas fa-edit"></i>
+						</a>
+						<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
+							<i class="fas fa-trash"></i>
+						</a>
 						<a id="selectedEquipmentInstructionManualToggleFullscreenButton" class="btn btn-sm btn-outline-secondary py-0 float-right" href="#" data-toggle="tooltip" title="{{ $L('Expand to fullscreen') }}">
 							<i class="fas fa-expand-arrows-alt"></i>
 						</a>
@@ -72,7 +69,13 @@
 			<div class="tab-pane fade" id="description-tab">
 				<div id="selectedEquipmentDescriptionCard" class="card">
 					<div class="card-header">
-						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>
+						<i class="fas fa-toolbox"></i> <span class="selected-equipment-name"></span>&nbsp;&nbsp;
+						<a class="btn btn-info btn-sm btn-outline-info py-0" href="{{ $U('/equipment/') }}{{ $equipmentItem->id }}">
+							<i class="fas fa-edit"></i>
+						</a>
+						<a class="btn btn-danger btn-sm btn-outline-danger py-0 equipment-delete-button" href="#" data-equipment-id="{{ $equipmentItem->id }}" data-equipment-name="{{ $equipmentItem->name }}">
+							<i class="fas fa-trash"></i>
+						</a>
 						<a id="selectedEquipmentDescriptionToggleFullscreenButton" class="btn btn-sm btn-outline-secondary py-0 float-right" href="#" data-toggle="tooltip" title="{{ $L('Expand to fullscreen') }}">
 							<i class="fas fa-expand-arrows-alt"></i>
 						</a>
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 4fa06428..003d1b2d 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -6,18 +6,15 @@
 
 @section('content')
 <div class="row">
-	<div class="col">
+	
+	<div class="col-xs-12 col-md-6 pb-3">
 		<h1>
 			@yield('title')
 			<a class="btn btn-outline-dark" href="{{ $U('/recipe/new') }}">
 				<i class="fas fa-plus"></i> {{ $L('Add') }}
 			</a>
 		</h1>
-	</div>
-</div>
 
-<div class="row">
-	<div class="col-xs-12 col-md-6 pb-3">
 		<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
 		<input type="text" class="form-control" id="search">