diff --git a/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js b/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
index a9330d1..daa0473 100644
--- a/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
+++ b/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
@@ -25,10 +25,13 @@
 
     // example params to buildTable:
     // {
-    //    self: this,
-    //    scope: $scope,
-    //    tag: 'device'
+    //    self: this,               <- controller object
+    //    scope: $scope,            <- controller scope
+    //    tag: 'device',            <- table identifier
+    //    selCb: selCb              <- row selection callback (optional)
     // }
+    //          Note: selCb() is passed the row data model of the selected row,
+    //                 or null when no row is selected.
 
     function buildTable(o) {
         var handlers = {},
diff --git a/web/gui/src/main/webapp/app/view/app/app.html b/web/gui/src/main/webapp/app/view/app/app.html
index 6627691..c484901 100644
--- a/web/gui/src/main/webapp/app/view/app/app.html
+++ b/web/gui/src/main/webapp/app/view/app/app.html
@@ -24,18 +24,24 @@
         </thead>
 
         <tbody>
-        <tr ng-repeat="app in ctrl.tableData"
-            ng-click="selectCallback(app)"
-            ng-class="{selected: app === sel}"
-            ng-repeat-done>
-            <td class="table-icon">
-                <div icon icon-id="{{app._iconid_state}}"></div>
-            </td>
-            <td>{{app.id}}</td>
-            <td>{{app.version}}</td>
-            <td>{{app.origin}}</td>
-            <td>{{app.desc}}</td>
-        </tr>
+            <tr ng-hide="ctrl.tableData.length">
+                <td class="nodata" colspan="5">
+                    No Applications found
+                </td>
+            </tr>
+
+            <tr ng-repeat="app in ctrl.tableData"
+                ng-click="selectCallback(app)"
+                ng-class="{selected: app === sel}"
+                ng-repeat-done>
+                <td class="table-icon">
+                    <div icon icon-id="{{app._iconid_state}}"></div>
+                </td>
+                <td>{{app.id}}</td>
+                <td>{{app.version}}</td>
+                <td>{{app.origin}}</td>
+                <td>{{app.desc}}</td>
+            </tr>
         </tbody>
     </table>