diff --git a/WebCms/Views/Queue/Index.cshtml b/WebCms/Views/Queue/Index.cshtml
index 8e03f76..3f1007c 100644
--- a/WebCms/Views/Queue/Index.cshtml
+++ b/WebCms/Views/Queue/Index.cshtml
@@ -6,7 +6,7 @@
     var grid = new WebGrid(Model.Items, rowsPerPage: 45);
 }
 
-<div class="row panel">
+<div class="row">
     <div class="col-lg-8">
         Service description: @Model.ServerDescription<br/>
         @*Est. processing time by LeafInput size -
@@ -37,7 +37,7 @@
                 grid.Column("Name", "Submitted By"),
                 grid.Column("TimeInProgress", "Statistics", item => Statistics(item.Value)),
                 grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
-                grid.Column("Total Results: " + Model.Items.Count(), format: item => Btns(item.Value))),
+                grid.Column("Total Results: " + Model.Items.Count(), format: item => Actions(item.Value))),
             htmlAttributes: new {@class = "table table-sm table-striped table-bordered table-hover"}
             )
         @grid.BootstrapPager()
@@ -53,37 +53,37 @@ else
     @Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput)
 }
 
-@helper Btns(LeafInput item)
+@helper Actions(LeafInput item)
 {
     <div class="btn-group text-nowrap" role="group">
         <div class="btn-group" role="group">
-            <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button id="actions(@item.Id)" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" 
+                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Actions
-                <span class="fa fa-caret-down"></span>
             </button>
-            <ul class="dropdown-menu">
-                <li>@DetailsLink(item)</li>
-                <li @DisableItem(!item.HasLeafChart)>@ChartLink(item)</li>
+            <div class="dropdown-menu" aria-labelledby="actions(@item.Id)">
+                <button class="dropdown-item">@DetailsLink(item)</button>
+                <button class="dropdown-item @DisableItem(!item.HasLeafChart)">@ChartLink(item)</button>
                 @if (item.IsPending)
                 {
-                    <li role="separator" class="divider"></li>
-                    <li class="dropdown-header">Priority</li>
-                    <li @DisableItem(item.PendingPriority == Priority.High)>@PriorityForm(item, Priority.High)</li>
-                    <li @DisableItem(item.PendingPriority == Priority.Normal)>@PriorityForm(item, Priority.Normal)</li>
-                    <li @DisableItem(item.PendingPriority == Priority.Low)>@PriorityForm(item, Priority.Low)</li>
+                    <div class="dropdown-divider"></div>
+                    <h6 class="dropdown-header">Priority</h6>
+                    <button class="dropdown-item @DisableItem(item.PendingPriority == Priority.High)">@PriorityForm(item, Priority.High)</button>
+                    <button class="dropdown-item @DisableItem(item.PendingPriority == Priority.Normal)">@PriorityForm(item, Priority.Normal)</button>
+                    <button class="dropdown-item @DisableItem(item.PendingPriority == Priority.Low)">@PriorityForm(item, Priority.Low)</button>
                 }
                 @if (item.IsCancellable)
                 {
-                    <li role="separator" class="divider"></li>
-                    <li>@CancelLink(item)</li>
+                    <div class="dropdown-divider"></div>
+                    <button class="dropdown-item">@CancelLink(item)</button>
                 }
-                <li role="separator" class="divider"></li>
-                <li class="dropdown-header">Download</li>
-                <li>@DownloadInput(item)</li>
-                <li @DisableItem(!item.HasOutputFiles)>@DownloadOutputToUser(item)</li>
-                <li role="separator" class="divider"></li>
-                <li @DisableItem(!item.IsDeletable)>@DeleteLink(item)</li>
-            </ul>
+                <div class="dropdown-divider"></div>
+                <h6 class="dropdown-header">Download</h6>
+                <button class="dropdown-item">@DownloadInput(item)</button>
+                <button class="dropdown-item @DisableItem(!item.HasOutputFiles)">@DownloadOutputToUser(item)</button>
+                <div class="dropdown-divider"></div>
+                <button class="dropdown-item @DisableItem(!item.IsDeletable)">@DeleteLink(item)</button>
+            </div>
         </div>
     </div>
 }
@@ -163,6 +163,5 @@ else
 
 @helper DisableItem(bool disabled)
 {
-if (disabled)
-{<text>class="disabled"</text>}
+if (disabled){<text>disabled</text>}
 }
\ No newline at end of file