diff --git a/webinterface/templates/dashboards/dashboards.html b/webinterface/templates/dashboards/dashboards.html
index 2c8db33..5b14ef1 100644
--- a/webinterface/templates/dashboards/dashboards.html
+++ b/webinterface/templates/dashboards/dashboards.html
@@ -8,7 +8,7 @@ <h1 class="title">Tools</h1>
     <ul>
       <li class="{% if tab == 'query' %}is-active{% endif %}"><a href="query">DICOM Query</a></li>
       {% if is_admin %}
-      <li class="{% if tab == 'tests' %}is-active{% endif %}"><a href="tests">Self-test</a></li>
+      <li class="{% if tab == 'tests' %}is-active{% endif %}"><a href="tests">Self-Test</a></li>
       {% endif %}
       <!-- <li class="{% if page == 'tasks' %}is-active{% endif %}"><a href="tasks">Tasks</a></li> -->
 
diff --git a/webinterface/templates/dashboards/query.html b/webinterface/templates/dashboards/query.html
index 5ac35b0..82db285 100644
--- a/webinterface/templates/dashboards/query.html
+++ b/webinterface/templates/dashboards/query.html
@@ -20,7 +20,7 @@ <h1 class="title">DICOM Query</h1>
         <form class="box" id="form">
             <div class="field is-horizontal">
               <div class="field-label is-normal">
-                <label class="label">Accession</label>
+                <label class="label">Accession Number</label>
               </div>
               <div class="field-body">
                 <div class="field">
@@ -103,15 +103,13 @@ <h1 class="title">DICOM Query</h1>
             </div>
             <div class="field is-horizontal">
               <div class="field-label is-normal">
-                <label class="label">Offpeak </label>
-  
+                <label class="label">Off-Peak</label>
               </div>
               <div class="field-body">
                 <div class="field">
-                  <div class="control is-expanded">
-                    <label class="checkbox">
-                      <input type="checkbox" id="offpeak" name="offpeak" value="">
-                    </label>
+                  <div class="control is-expanded" style="padding-top: .375em;">
+                      <input type="checkbox" id="offpeak" name="offpeak" value="" class="switch is-dark is-rounded">
+                      <label for="offpeak"></label>
                   </div>
                 </div>
               </div>
@@ -121,23 +119,23 @@ <h1 class="title">DICOM Query</h1>
               <div class="field-label">
                 <!-- Left empty for spacing -->
               </div>
-              <div class="field-body">
+              <div class="field-body" style="margin-top: 10px;">
                 <div class="field">
                   <div class="control">
-                    <button type="button" id="check-accessions-button" class="button is-info">
-                      Check Accessions
+                    <button type="submit" id="get-accessions-button" class="button is-success">
+                      <i class="fas fa-check"></i>&nbsp;Submit Query
                     </button>
-                    <button type="submit" id="get-accessions-button" class="button is-primary">
-                      Get Accessions
+                    <button type="button" id="check-accessions-button" class="button is-dark">
+                      <i class="fas fa-question"></i>&nbsp;Check Accessions
                     </button>
                   </div>
                 </div>
               </div>
             </div>
           </form>
-          <div class="tabs" id="query_result_tabs">
+          <div class="tabs logtabs" id="query_result_tabs">
             <ul>
-              <li class="is-active"><a data-tab="get-accessions">Get Accessions</a></li>
+              <li class="is-active"><a data-tab="get-accessions">Query Status</a></li>
               <li><a data-tab="check-accessions">Check Accessions</a></li>
             </ul>
           </div>
diff --git a/webinterface/templates/dashboards/tests.html b/webinterface/templates/dashboards/tests.html
index 35e15df..afead91 100644
--- a/webinterface/templates/dashboards/tests.html
+++ b/webinterface/templates/dashboards/tests.html
@@ -109,7 +109,7 @@ <h1 class="title is-4">Self-Test</h1>
                 <div class="field-label">
                   <!-- Left empty for spacing -->
                 </div>
-                <div class="field-body">
+                <div class="field-body" style="margin-top: 10px;">
                   <div class="field">
                     <div class="control">
                       <button type="submit" class="button is-success">
diff --git a/webinterface/templates/targets.html b/webinterface/templates/targets.html
index 70e09a6..91b9d5d 100755
--- a/webinterface/templates/targets.html
+++ b/webinterface/templates/targets.html
@@ -28,7 +28,7 @@ <h1 class="title is-4">Routing Targets</h1>
                 <p class="card-header-title card-toggle">
                     <span class="icon has-tooltip-left has-tooltip-success" data-tooltip="{{get_target_handler(target).display_name}} Target"><i class="fas {{get_target_handler(target).icon}} fa-lg"></i></span>
                     &nbsp;&nbsp;{{ target_name }}<span style="margin-left:auto; font-weight: 200;"> {{target.short_description}}
-                    {% if target.direction=='pull' %}&nbsp;<i class="has-text-grey fas fa-download"></i>{%elif target.direction=='push'%}&nbsp;<i class="has-text-grey fas fa-upload"></i>{%elif target.direction=='both'%}&nbsp;<i class="has-text-grey fas fa-server"></i>{%endif%}
+                    {% if target.direction=='pull' %}&nbsp;<span class="icon has-tooltip-right has-tooltip-success" data-tooltip="Can query images"><i class="has-text-grey fas fa-download"></i></span>{%elif target.direction=='push'%}&nbsp;<span class="icon has-tooltip-right has-tooltip-success" data-tooltip="Can store images"><i class="has-text-grey fas fa-upload"></i></span>{%elif target.direction=='both'%}&nbsp;<span class="icon has-tooltip-right has-tooltip-success" data-tooltip="Can store and query images"><i class="has-text-grey fas fa-server"></i></span>{%endif%}
                     </span>
                 </p>
                 <a class="card-header-icon card-toggle">
diff --git a/webinterface/templates/targets_edit.html b/webinterface/templates/targets_edit.html
index 12b7510..685b867 100755
--- a/webinterface/templates/targets_edit.html
+++ b/webinterface/templates/targets_edit.html
@@ -32,7 +32,7 @@ <h1 class="title is-4">Edit Target - {{edittarget}}</h1>
                         <label class="label">Type</label>
                         <div class="select">
                             <div class="control">
-                                <select name="target_type" id="target_type" value="{{targets[edittarget].target_type}}">
+                                <select name="target_type" id="target_type" value="{{targets[edittarget].target_type}}" style="min-width: 160px;">
                                     {% for t in target_names|sort %}
                                     <option value="{{ t }}" {% if targets[edittarget].target_type==t %}selected=true {%endif%}>{{get_target_handler(t).display_name}}</option>
                                     {% endfor %}
@@ -44,13 +44,13 @@ <h1 class="title is-4">Edit Target - {{edittarget}}</h1>
                     <div id="form-{{t.get_name()}}" class="target-form {% if not loop.index0 %}is-hidden{% endif %}">
                         {% if get_target_handler(t).can_pull %}
                         <div class="field">
-                            <label class="label">Direction</label>
+                            <label class="label">Capability</label>
                             <div class="select">
                                 <div class="control">
-                                    <select name="direction" id="direction" value="{{targets[edittarget].direction}}">
-                                        <option value="push" {% if targets[edittarget].direction=="push" %}selected=true {%endif%}>push</option>
-                                        <option value="pull" {% if targets[edittarget].direction=="pull" %}selected=true {%endif%}>pull</option>
-                                        <option value="both" {% if targets[edittarget].direction=="both" %}selected=true {%endif%}>both</option>
+                                    <select name="direction" id="direction" value="{{targets[edittarget].direction}}" style="min-width: 160px;">
+                                        <option value="push" {% if targets[edittarget].direction=="push" %}selected=true {%endif%}>Store</option>
+                                        <option value="pull" {% if targets[edittarget].direction=="pull" %}selected=true {%endif%}>Query</option>
+                                        <option value="both" {% if targets[edittarget].direction=="both" %}selected=true {%endif%}>Both</option>
                                     </select>
                                 </div>
                             </div>