diff --git a/monkey_island/cc/admin/ui/css/img/objects/computer-linux.png b/monkey_island/cc/admin/ui/css/img/objects/computer-linux.png
new file mode 100644
index 000000000..9c5dc728e
Binary files /dev/null and b/monkey_island/cc/admin/ui/css/img/objects/computer-linux.png differ
diff --git a/monkey_island/cc/admin/ui/css/img/objects/computer-windows.png b/monkey_island/cc/admin/ui/css/img/objects/computer-windows.png
new file mode 100644
index 000000000..f9a2f83a6
Binary files /dev/null and b/monkey_island/cc/admin/ui/css/img/objects/computer-windows.png differ
diff --git a/monkey_island/cc/admin/ui/index.html b/monkey_island/cc/admin/ui/index.html
index 9cb253316..33ffbf4ba 100644
--- a/monkey_island/cc/admin/ui/index.html
+++ b/monkey_island/cc/admin/ui/index.html
@@ -71,6 +71,23 @@
         </div>
         <!-- /.Network section -->
 
+        <!-- Info section -->
+        <div class="col-lg-3 col-md-6 col-sm-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <a href="#info" data-toggle="collapse">General Info</a>
+                </div>
+                <div id="info" class="panel-body panel-collapse collapse in">
+                    <div>
+                            Num of Monkeys: <label id="infoNumOfMonkeys">0</label>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+        <!-- /.Info section -->
+
         <!-- Details section -->
         <div class="col-lg-3 col-md-6 col-sm-6">
             <div class="panel panel-default">
diff --git a/monkey_island/cc/admin/ui/js/monkeys-admin.js b/monkey_island/cc/admin/ui/js/monkeys-admin.js
index 1afd4adba..ef253ca60 100644
--- a/monkey_island/cc/admin/ui/js/monkeys-admin.js
+++ b/monkey_island/cc/admin/ui/js/monkeys-admin.js
@@ -63,6 +63,8 @@ function initAdmin() {
         edges: edges
     };
 
+    $('#infoNumOfMonkeys').html(monkeys.length)
+
     var options = {
     };
 
@@ -132,6 +134,7 @@ function updateMonkeys() {
             {
                 monkeys.push(new_monkeys[i]);
                 nodes.push(createMonkeyNode(new_monkeys[i]));
+                $('#infoNumOfMonkeys').html(monkeys.length)
             }
         }
 
@@ -196,7 +199,18 @@ function createMonkeyNode(monkey) {
 }
 
 function createMachineNode(machine) {
-    img = ICONS_DIR + "computer" + ICONS_EXT;
+    img = "computer";
+
+    if (undefined != machine.os.type) {
+        if (machine.os.type == "linux") {
+            img += "-linux";
+        }
+        else if (machine.os.type == "windows") {
+            img += "-windows";
+        }
+    }
+
+    img = ICONS_DIR + img + ICONS_EXT;
 
     return {
             'id': machine.ip_addr,