diff --git a/Packages/design/styles/common/global.styl b/Packages/design/styles/common/global.styl
index e5b22e4e6..62db481d0 100644
--- a/Packages/design/styles/common/global.styl
+++ b/Packages/design/styles/common/global.styl
@@ -6,6 +6,9 @@ html body
 html hr
   theme('border-top', '1px solid $uiBorderColor')
 
+body .table > thead > tr > th
+  theme('border-color', '$uiBorderColor')
+
 label.form-group
   width: 100%
 
diff --git a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
index 8a2dc16be..3403bb8a6 100644
--- a/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
+++ b/Packages/lesiontracker/client/components/serverInformation/serverInformationDicomWeb/serverInformationDicomWeb.html
@@ -3,9 +3,6 @@
         <div class="col-lg-6">
             {{>inputText labelClass='form-group' key='wadoUriRoot'}}
         </div>
-        <div class="col-lg-6">
-            {{>inputText labelClass='form-group' key='wadoUriRootNOTE'}}
-        </div>
         <div class="col-lg-6">
             {{>inputText labelClass='form-group' key='wadoRoot'}}
         </div>
diff --git a/Packages/lesiontracker/client/components/serverInformation/serverInformationList/serverInformationList.html b/Packages/lesiontracker/client/components/serverInformation/serverInformationList/serverInformationList.html
index 4348dd9f9..5184b0b4d 100644
--- a/Packages/lesiontracker/client/components/serverInformation/serverInformationList/serverInformationList.html
+++ b/Packages/lesiontracker/client/components/serverInformation/serverInformationList/serverInformationList.html
@@ -22,7 +22,7 @@
                                         <i class="fa fa-square-o"></i>
                                     {{/if}}
                                 {{/button}}
-                                {{#button class='btn-sm btn-default' action='edit' params=server title='Edit'}}
+                                {{#button class='btn-sm btn-default' action='edit' params=server title='Edit' disabled=(eq server.origin 'json')}}
                                     <i class="fa fa-pencil"></i>
                                 {{/button}}
                                 {{#button class='btn-sm btn-danger' action='delete' params=server title='Remove' disabled=(eq server.origin 'json')}}
diff --git a/Packages/worklist/both/schema.js b/Packages/worklist/both/schema.js
index e69682cbc..1f7b7e994 100644
--- a/Packages/worklist/both/schema.js
+++ b/Packages/worklist/both/schema.js
@@ -45,12 +45,6 @@ export const DICOMWebServer = new SimpleSchema({
         label: 'WADO URI root',
         max: 1000
     },
-    // TODO: Remove this
-    wadoUriRootNOTE: {
-        type: String,
-        label: 'WADO URI root note',
-        optional: true
-    },
     wadoRoot: {
         type: String,
         label: 'WADO root',
diff --git a/config/dcm4cheeDIMSE.json b/config/dcm4cheeDIMSE.json
index 450bf189a..abdfea201 100644
--- a/config/dcm4cheeDIMSE.json
+++ b/config/dcm4cheeDIMSE.json
@@ -3,7 +3,6 @@
     "dicomWeb": [
       {
         "name": "DCM4CHEE",
-        "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
         "wadoUriRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/wado",
         "qidoRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/rs",
         "wadoRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/rs",
diff --git a/config/localhostOrthancDIMSE.json b/config/localhostOrthancDIMSE.json
index b10821a25..60da9211d 100644
--- a/config/localhostOrthancDIMSE.json
+++ b/config/localhostOrthancDIMSE.json
@@ -3,7 +3,6 @@
      "dicomWeb": [
       {
         "name": "Orthanc",
-        "wadoUriRootNOTE" : "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
         "wadoUriRoot" : "http://52.87.58.190:8043/wado",
         "qidoRoot": "http://localhost:8042/dicom-web",
         "wadoRoot": "http://localhost:8042/dicom-web",
diff --git a/config/medkenOrthanc.json b/config/medkenOrthanc.json
index f80d1ef9e..a58b94017 100644
--- a/config/medkenOrthanc.json
+++ b/config/medkenOrthanc.json
@@ -3,7 +3,6 @@
     "dicomWeb": [
       {
         "name": "Medken Orthanc",
-        "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
         "wadoUriRoot": "http://dicom-orthanc.medken.com/wado",
         "qidoRoot": "http://dicom-orthanc.medken.com/dicom-web",
         "wadoRoot": "http://dicom-orthanc.medken.com/dicom-web",
diff --git a/config/orthancDICOMWeb.json b/config/orthancDICOMWeb.json
index bae674c7b..d112feea1 100644
--- a/config/orthancDICOMWeb.json
+++ b/config/orthancDICOMWeb.json
@@ -3,7 +3,6 @@
     "dicomWeb": [
       {
         "name": "Orthanc",
-        "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
         "wadoUriRoot": "http://localhost:8042/wado",
         "qidoRoot": "http://localhost:8042/dicom-web",
         "wadoRoot": "http://localhost:8042/dicom-web",
diff --git a/config/orthancDIMSE.json b/config/orthancDIMSE.json
index 895e46155..524aea2a7 100644
--- a/config/orthancDIMSE.json
+++ b/config/orthancDIMSE.json
@@ -3,7 +3,6 @@
     "dicomWeb": [
       {
         "name": "Orthanc",
-        "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
         "wadoUriRoot": "http://localhost:8042/wado",
         "qidoRoot": "http://localhost:8042/dicom-web",
         "wadoRoot": "http://localhost:8042/dicom-web",