diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationForm.html b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationForm.html
new file mode 100644
index 000000000..eeab6f6be
--- /dev/null
+++ b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationForm.html
@@ -0,0 +1,19 @@
+<template name="serverInformationForm">
+    <div class="row">
+        <div class="col-lg-6">
+            <div class="form-group">
+                <label for="serverName">Server Name</label>
+                <input type="text" class="form-control" id="serverName">
+            </div>
+        </div>
+        <div class="col-lg-6">
+            <div class="form-group">
+                <label for="serverType">Server Type</label>
+                <select class="form-control" id="serverType">
+                    <option value="dicomWeb">DICOM Web</option>
+                    <option value="dimse">DIMSE</option>
+                </select>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationList.html b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationList.html
new file mode 100644
index 000000000..a52f62309
--- /dev/null
+++ b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationList.html
@@ -0,0 +1,36 @@
+<template name="serverInformationList">
+    <table id="tblServer" class="table">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Type</th>
+                <th class="text-right">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            {{#each server in servers}}
+                <tr>
+                    <td>{{server.name}}</td>
+                    <td>{{server.type}}</td>
+                    <td class="text-right">
+                        <div class="btn-group" role="group" aria-label="Actions">
+                            <button class="btn btn-sm btn-default editServer" {{tooltipTop "Edit"}}>
+                                <i class="fa fa-pencil"></i>
+                            </button>
+                            <button class="btn btn-sm btn-danger removeServer" {{tooltipTop "Remove"}}>
+                                <i class="fa fa-trash"></i>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
+            {{else}}
+                <tr>
+                    <td class="text-center" colspan="3">No servers found</td>
+                </tr>
+            {{/each}}
+        </tbody>
+    </table>
+    <button class="btn btn-default addServer">
+        <i class="fa fa-plus"></i> Add a new server
+    </button>
+</template>
diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationList.js b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationList.js
new file mode 100644
index 000000000..f706ab21b
--- /dev/null
+++ b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationList.js
@@ -0,0 +1,26 @@
+Template.serverInformationList.onRendered(function() {
+    var instance = Template.instance();
+    instance.$('[data-toggle="tooltip"]').tooltip({ container: 'body' });
+});
+
+Template.serverInformationList.helpers({
+    tooltipTop: function(title) {
+        return {
+            'data-toggle': 'tooltip',
+            'data-placement': 'top',
+            title: title
+        };
+    },
+    servers: function() {
+        return Servers.find().fetch();
+    }
+});
+
+Template.serverInformationList.events({
+    'click .addServer': function(event, instance) {
+        instance.data.mode.set("create");
+    },
+    'click .editServer': function(event, instance) {
+        instance.data.mode.set("edit");
+    }
+});
diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.html b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.html
index c7f90959e..6c9a832f4 100644
--- a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.html
+++ b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.html
@@ -1,44 +1,18 @@
 <template name="serverInformationModal">
     <div class="modal" id="serverInformationModal" tabindex="-1" role="dialog" aria-labelledby="serverInformationModalLabel">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                     <h4 class="modal-title" id="serverInformationModalLabel">Server Information</h4>
                 </div>
                 <div class="modal-body">
-                    {{#each serverInformation}}
-                        <table id="tblServer" class="table table-bordered table-hovered">
-                            <tbody>
-                                <tr>
-                                    <th>
-                                        Host
-                                    </th>
-                                    <td>
-                                        {{host}}
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th>
-                                        Port
-                                    </th>
-                                    <td>
-                                        {{port}}
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th>
-                                        AE Title
-                                    </th>
-                                    <td>
-                                        {{aeTitle}}
-                                    </td>
-                                </tr>
-                            </tbody>
-
-                        </table>
-                    {{/each}}
-
+                    {{#if equals instance.container.mode.get "list"}}
+                        {{>serverInformationList instance.container}}
+                    {{/if}}
+                    {{#if or (equals instance.container.mode.get "edit") (equals instance.container.mode.get "create")}}
+                        {{>serverInformationForm instance.container}}
+                    {{/if}}
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -46,4 +20,4 @@
             </div>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js
index d510b5d86..16cacc383 100644
--- a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js
+++ b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.js
@@ -1,28 +1,6 @@
-function parseUrl(url) {
-    var parser = document.createElement('a');
-    parser.href = url;
-    return parser;
-}
-
-Template.serverInformationModal.helpers({
-    serverInformation: function() {
-        // TODO: change for Collections
-        var defaultServiceType = Meteor.settings && Meteor.settings.defaultServiceType || 'dicomWeb';
-        var serviceInfo = Meteor.settings.servers[defaultServiceType];
-        if (defaultServiceType === 'dicomWeb') {
-            var serverInformationDicom = [];
-            serviceInfo.forEach(function(endpoint) {
-                var parsedUrl = parseUrl(endpoint.qidoRoot);
-                serverInformationDicom.push({
-                    host: parsedUrl.hostname,
-                    port: parsedUrl.port,
-                    aeTitle: endpoint.name
-                });
-            });
-
-            return serverInformationDicom;
-        }
-
-        return serviceInfo;
-    }
+Template.serverInformationModal.onCreated(function() {
+    var instance = Template.instance();
+    instance.container = {
+        mode: new ReactiveVar("list")
+    };
 });
diff --git a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.styl b/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.styl
deleted file mode 100644
index 5392abda8..000000000
--- a/Packages/lesiontracker/client/components/serverInformationModal/serverInformationModal.styl
+++ /dev/null
@@ -1,13 +0,0 @@
-#serverInformationModal
-  width: 350px
-  margin: 0 auto
-
-  .modal-dialog
-    width: 100%
-    #tblServer
-      tbody
-        tr
-          th
-            width: 30%
-          td
-            width: 70%
\ No newline at end of file
diff --git a/Packages/lesiontracker/client/helpers/blaze.js b/Packages/lesiontracker/client/helpers/blaze.js
new file mode 100644
index 000000000..8f5bc1163
--- /dev/null
+++ b/Packages/lesiontracker/client/helpers/blaze.js
@@ -0,0 +1,14 @@
+Template.registerHelper("instance", function() {
+    return Template.instance();
+});
+
+Template.registerHelper("extend", function(object, extendedProperties){
+    const result = {};
+    for (let i=0; i<arguments.length; i++) {
+        let current = arguments[i];
+        if (typeof current !== "object") continue;
+        current instanceof Spacebars.kw && (current = current.hash);
+        _.extend(result, current);
+    }
+    return result;
+});
diff --git a/Packages/lesiontracker/client/helpers/logical.js b/Packages/lesiontracker/client/helpers/logical.js
new file mode 100644
index 000000000..4dcb349b4
--- /dev/null
+++ b/Packages/lesiontracker/client/helpers/logical.js
@@ -0,0 +1,35 @@
+Template.registerHelper("choose", function() {
+    let result;
+    _.each(arguments, value => {
+        if (result || value instanceof Spacebars.kw) return;
+        value && (result = value);
+    });
+    return result;
+});
+
+Template.registerHelper("bool", function(value) {
+    return !!value;
+});
+
+Template.registerHelper("equals", function(a, b) {
+    return a === b;
+});
+
+Template.registerHelper("not", function(value) {
+    return !value;
+});
+
+Template.registerHelper("and", function() {
+    let result = true;
+    _.each(arguments, value => value || (result = false));
+    return result;
+});
+
+Template.registerHelper("or", function() {
+    let result = false;
+    _.each(arguments, value => {
+        if (value instanceof Spacebars.kw) return;
+        value && (result = true);
+    });
+    return result;
+});
diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js
index 711f109d4..f641c75b0 100644
--- a/Packages/lesiontracker/package.js
+++ b/Packages/lesiontracker/package.js
@@ -58,6 +58,10 @@ Package.onUse(function(api) {
     
     api.addFiles('client/tools.js', 'client');
 
+    // Spacebars helpers
+    api.addFiles('client/helpers/blaze.js', 'client');
+    api.addFiles('client/helpers/logical.js', 'client');
+
     // UI Components
     api.addFiles('client/components/viewer/viewer.html', 'client');
     api.addFiles('client/components/viewer/viewer.styl', 'client');
@@ -182,8 +186,10 @@ Package.onUse(function(api) {
     api.addFiles('client/components/lesionTrackerViewportOverlay/lesionTrackerViewportOverlay.html', 'client');
     api.addFiles('client/components/lesionTrackerViewportOverlay/lesionTrackerViewportOverlay.js', 'client');
 
+    api.addFiles('client/components/serverInformationModal/serverInformationForm.html', 'client');
+    api.addFiles('client/components/serverInformationModal/serverInformationList.html', 'client');
+    api.addFiles('client/components/serverInformationModal/serverInformationList.js', 'client');
     api.addFiles('client/components/serverInformationModal/serverInformationModal.html', 'client');
-    api.addFiles('client/components/serverInformationModal/serverInformationModal.styl', 'client');
     api.addFiles('client/components/serverInformationModal/serverInformationModal.js', 'client');
 
     api.addFiles('client/components/userAccountMenu/userAccountMenu.html', 'client');