diff --git a/src/tree-grid-directive.js b/src/tree-grid-directive.js
index e169d9c..f86ae04 100644
--- a/src/tree-grid-directive.js
+++ b/src/tree-grid-directive.js
@@ -6,7 +6,7 @@
             function ($templateCache) {
                 $templateCache.put('template/treeGrid/treeGrid.html',
                     "<div class=\"table-responsive\">\n" +
-                    " <table class=\"table tree-grid\">\n" +
+                    " <table class=\"table tree-grid\" role=\"treegrid\">\n" +
                     "   <thead>\n" +
                     "     <tr>\n" +
                     "       <th><a ng-if=\"expandingProperty.sortable\" ng-click=\"sortBy(expandingProperty)\">{{expandingProperty.displayName || expandingProperty.field || expandingProperty}}</a><span ng-if=\"!expandingProperty.sortable\">{{expandingProperty.displayName || expandingProperty.field || expandingProperty}}</span><i ng-if=\"expandingProperty.sorted\" class=\"{{expandingProperty.sortingIcon}} pull-right\"></i></th>\n" +
@@ -15,13 +15,14 @@
                     "   </thead>\n" +
                     "   <tbody>\n" +
                     "     <tr ng-repeat=\"row in tree_rows | searchFor:$parent.filterString:expandingProperty:colDefinitions track by row.branch.uid\"\n" +
-                    "       ng-class=\"'level-' + {{ row.level }} + (row.branch.selected ? ' active':'')\" class=\"tree-grid-row\">\n" +
-                    "       <td><a ng-click=\"user_clicks_branch(row.branch)\"><i ng-class=\"row.tree_icon\"\n" +
-                    "              ng-click=\"row.branch.expanded = !row.branch.expanded\"\n" +
-                    "              class=\"indented tree-icon\"></i></a><span ng-if=\"expandingProperty.cellTemplate\" class=\"indented tree-label\" " +
-                    "              ng-click=\"on_user_click(row.branch)\" compile=\"expandingProperty.cellTemplate\"></span>" +
-                    "              <span  ng-if=\"!expandingProperty.cellTemplate\" class=\"indented tree-label\" ng-click=\"on_user_click(row.branch)\">\n" +
-                    "             {{row.branch[expandingProperty.field] || row.branch[expandingProperty]}}</span>\n" +
+                    "       ng-class=\"'level-' + {{ row.level }} + (row.branch.selected ? ' active':'')\" class=\"tree-grid-row\" role=\"row\" aria-level=\"{{row.level}}\">\n" +
+                    "       <td role=\"rowheader\">\n" +
+                    "              <a ng-if=\"row.branch.children && row.branch.children.length > 0\" href=\"javascript:void(0);\" ng-click=\"user_clicks_branch(row.branch)\" aria-expanded=\"{{row.branch.expanded}}\" role=\"button\" class=\"indented\"><i ng-class=\"row.tree_icon\" class=\"tree-icon\"></i></a>\n" +
+                    "              <i ng-if=\"!row.branch.children || row.branch.children.length === 0\" ng-class=\"row.tree_icon\" class=\"indented\"></i>\n" +
+                    "              <span ng-if=\"expandingProperty.cellTemplate && user_click_exists()\" class=\"indented\" ng-click=\"on_user_click(row.branch)\" compile=\"expandingProperty.cellTemplate\"></span>\n" +
+                    "              <span ng-if=\"!expandingProperty.cellTemplate && user_click_exists()\" class=\"indented\" ng-click=\"on_user_click(row.branch)\">{{row.branch[expandingProperty.field] || row.branch[expandingProperty]}}</span>\n" +
+                    "              <span ng-if=\"expandingProperty.cellTemplate && !user_click_exists()\" class=\"indented\" compile=\"expandingProperty.cellTemplate\"></span>\n" +
+                    "              <span ng-if=\"!expandingProperty.cellTemplate && !user_click_exists()\" class=\"indented\">{{row.branch[expandingProperty.field] || row.branch[expandingProperty]}}</span>\n" +
                     "       </td>\n" +
                     "       <td ng-repeat=\"col in colDefinitions\">\n" +
                     "         <div ng-if=\"col.cellTemplate\" compile=\"col.cellTemplate\" cell-template-scope=\"col.cellTemplateScope\"></div>\n" +
@@ -111,6 +112,11 @@
                             return;
                         }
 
+                        scope.user_click_exists = function () {
+                            var exists = angular.isDefined(attrs.onClick);
+                            return exists;
+                        };
+
                         var getExpandingProperty = function getExpandingProperty() {
                             if (attrs.expandOn) {
                                 expandingProperty = scope.expandOn;
@@ -213,6 +219,7 @@
                             }
                         };
                         scope.user_clicks_branch = function (branch) {
+                            branch.expanded = !branch.expanded;
                             if (branch !== selected_branch) {
                                 return select_branch(branch);
                             }