diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss
index 48c223b..5fb084f 100644
--- a/resources/assets/sass/dashboard.scss
+++ b/resources/assets/sass/dashboard.scss
@@ -265,7 +265,16 @@ body {
 
             @media (max-width: $screen-xs-max) {
                 margin: 3px;
-                padding-left: 60px;
+            }
+
+            @media (min-width: $screen-sm-min) {
+                display: flex;
+            }
+
+            &.sortable {
+                @media (max-width: $screen-xs-max) {
+                    padding-left: 50px;
+                }
             }
 
             .title-column {
@@ -279,7 +288,9 @@ body {
                 }
 
                 @media (min-width: $screen-sm-min) {
-                    float: left;
+                    overflow: hidden;
+                    flex-grow: 1;
+                    white-space: nowrap;
                 }
 
                 .sort-icon {
@@ -316,15 +327,16 @@ body {
 
             .button-column {
                 padding-right: 0px;
-                padding-left: 0px;
 
                 @media (max-width: $screen-xs-max) {
                     padding-bottom: 5px;
+                    padding-left: 0px;
                     text-align: center;
                 }
 
                 @media (min-width: $screen-sm-min) {
-                    float: right;
+                    padding-left: 5px;
+                    flex-shrink: 0;
                     text-align: right;
                 }
 
diff --git a/resources/views/dashboard/edit-list.blade.php b/resources/views/dashboard/edit-list.blade.php
index 2a0fb87..7abfefc 100644
--- a/resources/views/dashboard/edit-list.blade.php
+++ b/resources/views/dashboard/edit-list.blade.php
@@ -20,43 +20,39 @@
 
         <ul id="edit-list" class="list-group edit-list list" data-model="{{ $model }}" data-path="{{ isset($path) ? $path : $model }}" {{ $sortcol != false ? "data-sort=$sortcol" : '' }}>
             @foreach($rows as $row)
-                <li class="list-group-item" data-id="{{ $row['id'] }}">
-                    <div class="container-fluid">
-                        <div class="row">
-                            <div class="title-column">
-                                @if($sortcol != false)
-                                    <div class="sort-icon">
-                                        <i class="fa fa-bars" title="Click and drag to reorder"></i>
-                                    </div>
-                                @endif
-
-                                @if(is_array($column))
-                                    @foreach($column as $col)
-                                        @if($row[$col] != '')
-                                            <div class="column">{{ $row[$col] }}</div>
-
-                                            @if(!$loop->last)
-                                                <div class="spacer">|</div>
-                                            @endif
-                                        @endif
-                                    @endforeach
-                                @else
-                                    {{ $row[$column] }}
-                                @endif
+                <li class="list-group-item {{ $sortcol != false ? 'sortable' : '' }}" data-id="{{ $row['id'] }}">
+                    <div class="title-column">
+                        @if($sortcol != false)
+                            <div class="sort-icon">
+                                <i class="fa fa-bars" title="Click and drag to reorder"></i>
                             </div>
+                        @endif
 
-                            <div class="button-column">
-                                @if(isset($button) && is_array($button))
-                                    <button type="button" class="action-button btn btn-default" data-confirmation="{{ $button[1] }}" data-success="{{ $button[2] }}" data-error="{{ $button[3] }}" data-url="{{ $button[4] }}">{{ $button[0] }}</button>
+                        @if(is_array($column))
+                            @foreach($column as $col)
+                                @if($row[$col] != '')
+                                    <div class="column">{{ $row[$col] }}</div>
+
+                                    @if(!$loop->last)
+                                        <div class="spacer">|</div>
+                                    @endif
                                 @endif
+                            @endforeach
+                        @else
+                            {{ $row[$column] }}
+                        @endif
+                    </div>
 
-                                <button type="button" class="edit-button btn btn-warning">Edit</button>
+                    <div class="button-column">
+                        @if(isset($button) && is_array($button))
+                            <button type="button" class="action-button btn btn-default" data-confirmation="{{ $button[1] }}" data-success="{{ $button[2] }}" data-error="{{ $button[3] }}" data-url="{{ $button[4] }}">{{ $button[0] }}</button>
+                        @endif
 
-                                @if($delete)
-                                    <button type="button" class="delete-button btn btn-danger">Delete</button>
-                                @endif
-                            </div>
-                        </div>
+                        <button type="button" class="edit-button btn btn-warning">Edit</button>
+
+                        @if($delete)
+                            <button type="button" class="delete-button btn btn-danger">Delete</button>
+                        @endif
                     </div>
                 </li>
             @endforeach