diff --git a/index.html b/index.html
index 5281f07..854b609 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@
             <div id="host-grid">
                 <div class="page-title">Your PCs</div>
                 <div class="add-host-card mdl-card mdl-shadow--4dp" id='addHostCell'>
-                    <div class="mdl-card__title mdl-card--expand" id="addHostIcon">
+                    <div class="mdl-card__title mdl-card--expand" id="addHostIcon" role="link" tabindex="0" aria-label="Add Host">
                         <h2 class="mdl-card__title-text" >Add Host</h2>
                     </div>
                 </div>
diff --git a/static/js/index.js b/static/js/index.js
index b16271b..12c16d2 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -336,10 +336,10 @@ function addHost() {
 // host is an NvHTTP object
 function addHostToGrid(host, ismDNSDiscovered) {
 
-    var outerDiv = $("<div>", {class: 'host-container mdl-card mdl-shadow--4dp', id: 'host-container-' + host.serverUid });
+    var outerDiv = $("<div>", {class: 'host-container mdl-card mdl-shadow--4dp', id: 'host-container-' + host.serverUid, role: 'link', tabindex: 0, 'aria-label': host.hostname });
     var cell = $("<div>", {class: 'mdl-card__title mdl-card--expand', id: 'hostgrid-' + host.serverUid });
     $(cell).prepend($("<h2>", {class: "mdl-card__title-text", html: host.hostname}));
-    var removalButton = $("<div>", {class: "remove-host", id: "removeHostButton-" + host.serverUid});
+    var removalButton = $("<div>", {class: "remove-host", id: "removeHostButton-" + host.serverUid, role: 'button', tabindex: 0, 'aria-label': 'Remove host ' + host.hostname});
     removalButton.off('click');
     removalButton.click(function () {
         removeClicked(host);