diff --git a/www/.tmp/public/jst.js b/www/.tmp/public/jst.js
index 9fdb4ea..f5ee157 100644
--- a/www/.tmp/public/jst.js
+++ b/www/.tmp/public/jst.js
@@ -24,7 +24,7 @@ this["JST"]["assets/templates/docs.html"] = function(obj) {
 obj || (obj = {});
 var __t, __p = '', __e = _.escape;
 with (obj) {
-__p += '<form action="http://localhost:3000/doc/upload" enctype="multipart/form-data" method="post">\n    <input type="text" name="title"><br>\n    <input type="file" name="document" multiple="multiple"><br>\n    <input type="submit" value="Upload">\n</form>\n';
+__p += '<div class="container">\n    <div class="row">\n            <div ng-repeat="doc in docs" class="col-md-3 well">\n                <h2><a href="{{doc.location}}">{{doc.name}}</a></h2>\n                <img ng-if="doc.img_url" class="img img-responsive" src="{{doc.img_url}}">\n                <img ng-if="!doc.img_url" class="img img-responsive" src="/images/icons/_blank.png">\n            </div>\n    </div>\n\n\n    <div class="row">\n        <div clas="col-md-6 col-md-offset-3 well">\n            <form action="http://localhost:3000/doc/upload" enctype="multipart/form-data" method="post">\n                <input type="text" name="title"><br>\n                <input type="file" name="document" multiple="multiple"><br>\n                <input type="submit" value="Upload">\n            </form>\n        </div>\n    </div>\n</div>\n';
 
 }
 return __p
diff --git a/www/api/controllers/DocController.js b/www/api/controllers/DocController.js
index 1a4d177..2fad2da 100644
--- a/www/api/controllers/DocController.js
+++ b/www/api/controllers/DocController.js
@@ -8,15 +8,15 @@
 module.exports = {
 
 	upload: function  (req, res) {
-		console.log(require('path').resolve(sails.config.appPath, './assets/filestorage'));
+		console.log(require('path').resolve(sails.config.appPath));
 		req.file('document').upload({
 			dirname: require('path').resolve(sails.config.appPath, './assets/filestorage')
 		}, function (err, files) {
 			if (err) return res.serverError(err);
 			for (var i = 0; i < files.length; i ++){
 				Doc.create({
-					name: files[i].name,
-					location: files[i].fd,
+					name: files[i].filename,
+					location: files[i].fd.split("assets/")[1],
 					visible: true
 				}).exec(function(err, created){
 					if (err) console.log(err);
@@ -29,5 +29,4 @@ module.exports = {
 			});
 		});
 	}
-
 };
diff --git a/www/assets/images/icons/_blank.png b/www/assets/images/icons/_blank.png
new file mode 100755
index 0000000..ae53a4e
Binary files /dev/null and b/www/assets/images/icons/_blank.png differ
diff --git a/www/assets/images/icons/_page.png b/www/assets/images/icons/_page.png
new file mode 100755
index 0000000..b8d155e
Binary files /dev/null and b/www/assets/images/icons/_page.png differ
diff --git a/www/assets/images/icons/aac.png b/www/assets/images/icons/aac.png
new file mode 100755
index 0000000..200db51
Binary files /dev/null and b/www/assets/images/icons/aac.png differ
diff --git a/www/assets/images/icons/ai.png b/www/assets/images/icons/ai.png
new file mode 100755
index 0000000..c1810f5
Binary files /dev/null and b/www/assets/images/icons/ai.png differ
diff --git a/www/assets/images/icons/aiff.png b/www/assets/images/icons/aiff.png
new file mode 100755
index 0000000..f9f1faf
Binary files /dev/null and b/www/assets/images/icons/aiff.png differ
diff --git a/www/assets/images/icons/avi.png b/www/assets/images/icons/avi.png
new file mode 100755
index 0000000..6ddfcea
Binary files /dev/null and b/www/assets/images/icons/avi.png differ
diff --git a/www/assets/images/icons/bmp.png b/www/assets/images/icons/bmp.png
new file mode 100755
index 0000000..0efcc32
Binary files /dev/null and b/www/assets/images/icons/bmp.png differ
diff --git a/www/assets/images/icons/c.png b/www/assets/images/icons/c.png
new file mode 100755
index 0000000..249e6c7
Binary files /dev/null and b/www/assets/images/icons/c.png differ
diff --git a/www/assets/images/icons/cpp.png b/www/assets/images/icons/cpp.png
new file mode 100755
index 0000000..0a6cd8b
Binary files /dev/null and b/www/assets/images/icons/cpp.png differ
diff --git a/www/assets/images/icons/css.png b/www/assets/images/icons/css.png
new file mode 100755
index 0000000..8035b9d
Binary files /dev/null and b/www/assets/images/icons/css.png differ
diff --git a/www/assets/images/icons/dat.png b/www/assets/images/icons/dat.png
new file mode 100755
index 0000000..971e364
Binary files /dev/null and b/www/assets/images/icons/dat.png differ
diff --git a/www/assets/images/icons/dmg.png b/www/assets/images/icons/dmg.png
new file mode 100755
index 0000000..94a38ae
Binary files /dev/null and b/www/assets/images/icons/dmg.png differ
diff --git a/www/assets/images/icons/doc.png b/www/assets/images/icons/doc.png
new file mode 100755
index 0000000..aff8234
Binary files /dev/null and b/www/assets/images/icons/doc.png differ
diff --git a/www/assets/images/icons/dotx.png b/www/assets/images/icons/dotx.png
new file mode 100755
index 0000000..b0220e3
Binary files /dev/null and b/www/assets/images/icons/dotx.png differ
diff --git a/www/assets/images/icons/dwg.png b/www/assets/images/icons/dwg.png
new file mode 100755
index 0000000..de4fe53
Binary files /dev/null and b/www/assets/images/icons/dwg.png differ
diff --git a/www/assets/images/icons/dxf.png b/www/assets/images/icons/dxf.png
new file mode 100755
index 0000000..2ed2465
Binary files /dev/null and b/www/assets/images/icons/dxf.png differ
diff --git a/www/assets/images/icons/eps.png b/www/assets/images/icons/eps.png
new file mode 100755
index 0000000..cc32db8
Binary files /dev/null and b/www/assets/images/icons/eps.png differ
diff --git a/www/assets/images/icons/exe.png b/www/assets/images/icons/exe.png
new file mode 100755
index 0000000..60e5f6b
Binary files /dev/null and b/www/assets/images/icons/exe.png differ
diff --git a/www/assets/images/icons/flv.png b/www/assets/images/icons/flv.png
new file mode 100755
index 0000000..73bc4cc
Binary files /dev/null and b/www/assets/images/icons/flv.png differ
diff --git a/www/assets/images/icons/gif.png b/www/assets/images/icons/gif.png
new file mode 100755
index 0000000..07e601f
Binary files /dev/null and b/www/assets/images/icons/gif.png differ
diff --git a/www/assets/images/icons/h.png b/www/assets/images/icons/h.png
new file mode 100755
index 0000000..f5cc5e5
Binary files /dev/null and b/www/assets/images/icons/h.png differ
diff --git a/www/assets/images/icons/hpp.png b/www/assets/images/icons/hpp.png
new file mode 100755
index 0000000..ddcc8bf
Binary files /dev/null and b/www/assets/images/icons/hpp.png differ
diff --git a/www/assets/images/icons/html.png b/www/assets/images/icons/html.png
new file mode 100755
index 0000000..454cd9f
Binary files /dev/null and b/www/assets/images/icons/html.png differ
diff --git a/www/assets/images/icons/ics.png b/www/assets/images/icons/ics.png
new file mode 100755
index 0000000..7a0f5c0
Binary files /dev/null and b/www/assets/images/icons/ics.png differ
diff --git a/www/assets/images/icons/iso.png b/www/assets/images/icons/iso.png
new file mode 100755
index 0000000..729fa7f
Binary files /dev/null and b/www/assets/images/icons/iso.png differ
diff --git a/www/assets/images/icons/java.png b/www/assets/images/icons/java.png
new file mode 100755
index 0000000..0d46a4a
Binary files /dev/null and b/www/assets/images/icons/java.png differ
diff --git a/www/assets/images/icons/jpg.png b/www/assets/images/icons/jpg.png
new file mode 100755
index 0000000..4262c4e
Binary files /dev/null and b/www/assets/images/icons/jpg.png differ
diff --git a/www/assets/images/icons/js.png b/www/assets/images/icons/js.png
new file mode 100755
index 0000000..507661c
Binary files /dev/null and b/www/assets/images/icons/js.png differ
diff --git a/www/assets/images/icons/key.png b/www/assets/images/icons/key.png
new file mode 100755
index 0000000..44ab47e
Binary files /dev/null and b/www/assets/images/icons/key.png differ
diff --git a/www/assets/images/icons/less.png b/www/assets/images/icons/less.png
new file mode 100755
index 0000000..2d7b56f
Binary files /dev/null and b/www/assets/images/icons/less.png differ
diff --git a/www/assets/images/icons/mid.png b/www/assets/images/icons/mid.png
new file mode 100755
index 0000000..fc50598
Binary files /dev/null and b/www/assets/images/icons/mid.png differ
diff --git a/www/assets/images/icons/mp3.png b/www/assets/images/icons/mp3.png
new file mode 100755
index 0000000..568a51c
Binary files /dev/null and b/www/assets/images/icons/mp3.png differ
diff --git a/www/assets/images/icons/mp4.png b/www/assets/images/icons/mp4.png
new file mode 100755
index 0000000..c83c923
Binary files /dev/null and b/www/assets/images/icons/mp4.png differ
diff --git a/www/assets/images/icons/mpg.png b/www/assets/images/icons/mpg.png
new file mode 100755
index 0000000..e106159
Binary files /dev/null and b/www/assets/images/icons/mpg.png differ
diff --git a/www/assets/images/icons/odf.png b/www/assets/images/icons/odf.png
new file mode 100755
index 0000000..8173771
Binary files /dev/null and b/www/assets/images/icons/odf.png differ
diff --git a/www/assets/images/icons/ods.png b/www/assets/images/icons/ods.png
new file mode 100755
index 0000000..a3c5cc2
Binary files /dev/null and b/www/assets/images/icons/ods.png differ
diff --git a/www/assets/images/icons/odt.png b/www/assets/images/icons/odt.png
new file mode 100755
index 0000000..1e72fd4
Binary files /dev/null and b/www/assets/images/icons/odt.png differ
diff --git a/www/assets/images/icons/otp.png b/www/assets/images/icons/otp.png
new file mode 100755
index 0000000..b419dc6
Binary files /dev/null and b/www/assets/images/icons/otp.png differ
diff --git a/www/assets/images/icons/ots.png b/www/assets/images/icons/ots.png
new file mode 100755
index 0000000..712b039
Binary files /dev/null and b/www/assets/images/icons/ots.png differ
diff --git a/www/assets/images/icons/ott.png b/www/assets/images/icons/ott.png
new file mode 100755
index 0000000..2540efd
Binary files /dev/null and b/www/assets/images/icons/ott.png differ
diff --git a/www/assets/images/icons/pdf.png b/www/assets/images/icons/pdf.png
new file mode 100755
index 0000000..b288c3f
Binary files /dev/null and b/www/assets/images/icons/pdf.png differ
diff --git a/www/assets/images/icons/php.png b/www/assets/images/icons/php.png
new file mode 100755
index 0000000..615591e
Binary files /dev/null and b/www/assets/images/icons/php.png differ
diff --git a/www/assets/images/icons/png.png b/www/assets/images/icons/png.png
new file mode 100755
index 0000000..374333c
Binary files /dev/null and b/www/assets/images/icons/png.png differ
diff --git a/www/assets/images/icons/ppt.png b/www/assets/images/icons/ppt.png
new file mode 100755
index 0000000..42f8895
Binary files /dev/null and b/www/assets/images/icons/ppt.png differ
diff --git a/www/assets/images/icons/psd.png b/www/assets/images/icons/psd.png
new file mode 100755
index 0000000..4351dd3
Binary files /dev/null and b/www/assets/images/icons/psd.png differ
diff --git a/www/assets/images/icons/py.png b/www/assets/images/icons/py.png
new file mode 100755
index 0000000..9e5668f
Binary files /dev/null and b/www/assets/images/icons/py.png differ
diff --git a/www/assets/images/icons/qt.png b/www/assets/images/icons/qt.png
new file mode 100755
index 0000000..4deac47
Binary files /dev/null and b/www/assets/images/icons/qt.png differ
diff --git a/www/assets/images/icons/rar.png b/www/assets/images/icons/rar.png
new file mode 100755
index 0000000..ad4b879
Binary files /dev/null and b/www/assets/images/icons/rar.png differ
diff --git a/www/assets/images/icons/rb.png b/www/assets/images/icons/rb.png
new file mode 100755
index 0000000..5b4a52b
Binary files /dev/null and b/www/assets/images/icons/rb.png differ
diff --git a/www/assets/images/icons/rtf.png b/www/assets/images/icons/rtf.png
new file mode 100755
index 0000000..99510b9
Binary files /dev/null and b/www/assets/images/icons/rtf.png differ
diff --git a/www/assets/images/icons/sass.png b/www/assets/images/icons/sass.png
new file mode 100755
index 0000000..27ebf76
Binary files /dev/null and b/www/assets/images/icons/sass.png differ
diff --git a/www/assets/images/icons/scss.png b/www/assets/images/icons/scss.png
new file mode 100755
index 0000000..33b47f4
Binary files /dev/null and b/www/assets/images/icons/scss.png differ
diff --git a/www/assets/images/icons/sql.png b/www/assets/images/icons/sql.png
new file mode 100755
index 0000000..1742560
Binary files /dev/null and b/www/assets/images/icons/sql.png differ
diff --git a/www/assets/images/icons/tga.png b/www/assets/images/icons/tga.png
new file mode 100755
index 0000000..2a97d3d
Binary files /dev/null and b/www/assets/images/icons/tga.png differ
diff --git a/www/assets/images/icons/tgz.png b/www/assets/images/icons/tgz.png
new file mode 100755
index 0000000..2572e1f
Binary files /dev/null and b/www/assets/images/icons/tgz.png differ
diff --git a/www/assets/images/icons/tiff.png b/www/assets/images/icons/tiff.png
new file mode 100755
index 0000000..a44d071
Binary files /dev/null and b/www/assets/images/icons/tiff.png differ
diff --git a/www/assets/images/icons/txt.png b/www/assets/images/icons/txt.png
new file mode 100755
index 0000000..36c466c
Binary files /dev/null and b/www/assets/images/icons/txt.png differ
diff --git a/www/assets/images/icons/wav.png b/www/assets/images/icons/wav.png
new file mode 100755
index 0000000..523b9b6
Binary files /dev/null and b/www/assets/images/icons/wav.png differ
diff --git a/www/assets/images/icons/xls.png b/www/assets/images/icons/xls.png
new file mode 100755
index 0000000..c66931c
Binary files /dev/null and b/www/assets/images/icons/xls.png differ
diff --git a/www/assets/images/icons/xlsx.png b/www/assets/images/icons/xlsx.png
new file mode 100755
index 0000000..5dd5905
Binary files /dev/null and b/www/assets/images/icons/xlsx.png differ
diff --git a/www/assets/images/icons/xml.png b/www/assets/images/icons/xml.png
new file mode 100755
index 0000000..9fcfced
Binary files /dev/null and b/www/assets/images/icons/xml.png differ
diff --git a/www/assets/images/icons/yml.png b/www/assets/images/icons/yml.png
new file mode 100755
index 0000000..373f983
Binary files /dev/null and b/www/assets/images/icons/yml.png differ
diff --git a/www/assets/images/icons/zip.png b/www/assets/images/icons/zip.png
new file mode 100755
index 0000000..238768c
Binary files /dev/null and b/www/assets/images/icons/zip.png differ
diff --git a/www/assets/js/ng/controller_doc.js b/www/assets/js/ng/controller_doc.js
index 0c87e07..9aaa5c8 100644
--- a/www/assets/js/ng/controller_doc.js
+++ b/www/assets/js/ng/controller_doc.js
@@ -1,6 +1,27 @@
-poconsole.controller('docsCtrl', function($scope, $route, Page, $log) {
+poconsole.controller('docsCtrl', function($scope, $route, Page, $log, docs) {
     Page.setTitle('Documents');
     Page.setPage('docs');
 
+    var file_types = ["_blank", "c", "dwg", "hpp", "key", "ods", "png", "rtf", "txt", "_page", "cpp", "dxf", "html", "less", "odt", "ppt", "sass", "wav", "aac", "css", "eps", "ics", "mid", "otp", "psd", "scss", "xls", "ai", "dat", "exe", "iso", "mp3", "ots", "py", "sql", "xlsx", "aiff", "dmg", "flv", "java", "mp4", "ott", "qt", "tga", "xml", "avi", "doc", "gif", "jpg", "mpg", "pdf", "rar", "tgz", "yml", "bmp", "dotx", "h", "js", "odf", "php", "rb", "tiff", "zip" ];
+
+    $scope.loadDocs = function(){
+        var loadDocs = docs.getAllDocs();
+        loadDocs.then(function(d){
+            var imageBase = "/images/icons/";
+            var imageExtension = ".png";
+            $scope.docs = d.docs.map(function(doc){
+                var spl = doc.location.split(".");
+                var ext = spl[spl.length - 1];
+                if(file_types.indexOf(ext) > -1){
+                    doc.img_url = imageBase + ext + imageExtension;
+                } else {
+                    doc.img_url = false;
+                }
+                return doc;
+            });
+        });
+    };
+    $scope.loadDocs();
+
 
 });
diff --git a/www/assets/js/ng/factory_docs.js b/www/assets/js/ng/factory_docs.js
new file mode 100644
index 0000000..a2ea600
--- /dev/null
+++ b/www/assets/js/ng/factory_docs.js
@@ -0,0 +1,29 @@
+poconsole.factory('docs',function($q, $http, $log){
+
+    var getAllDocs = function(){
+        var deferred = $q.defer();
+        $http.get('/doc').success(function(data) {
+        	deferred.resolve({
+    			docs:data
+    		});
+        });
+        return deferred.promise;
+    };
+
+    var getDoc = function(id){
+        var deferred = $q.defer();
+        $http.get('/doc/' + id).success(function(data) {
+        	deferred.resolve({
+    			docs:data
+    		});
+        });
+        return deferred.promise;
+    };
+
+
+    return {
+        getAllDocs:getAllDocs,
+        getDoc: getDoc
+    };
+
+});
diff --git a/www/assets/templates/docs.html b/www/assets/templates/docs.html
index 40df346..de44a73 100644
--- a/www/assets/templates/docs.html
+++ b/www/assets/templates/docs.html
@@ -1,5 +1,20 @@
-<form action="http://localhost:3000/doc/upload" enctype="multipart/form-data" method="post">
-    <input type="text" name="title"><br>
-    <input type="file" name="document" multiple="multiple"><br>
-    <input type="submit" value="Upload">
-</form>
+<div class="container">
+    <div class="row">
+            <div ng-repeat="doc in docs" class="col-md-3 well">
+                <h2><a href="{{doc.location}}">{{doc.name}}</a></h2>
+                <img ng-if="doc.img_url" class="img img-responsive" src="{{doc.img_url}}">
+                <img ng-if="!doc.img_url" class="img img-responsive" src="/images/icons/_blank.png">
+            </div>
+    </div>
+
+
+    <div class="row">
+        <div clas="col-md-6 col-md-offset-3 well">
+            <form action="http://localhost:3000/doc/upload" enctype="multipart/form-data" method="post">
+                <input type="text" name="title"><br>
+                <input type="file" name="document" multiple="multiple"><br>
+                <input type="submit" value="Upload">
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/www/assets/templates/tags.html b/www/assets/templates/tags.html
index c5a103f..de2a25e 100644
--- a/www/assets/templates/tags.html
+++ b/www/assets/templates/tags.html
@@ -10,7 +10,7 @@
                 <form>
                     <div class="form-group">
                         <label for="data_source">Data Source</label>
-                        <select ng-model="newTag.deviceID" ng-options="d as d.address for d in devices track by d.id" class="form-control" id="data_source"></select>
+                        <select ng-model="newTag.deviceID" ng-options="d as device_label(d) for d in devices track by d.id" class="form-control" id="data_source"></select>
                     </div>
                     <div class="form-group">
                         <label for="tag">Tag</label>
diff --git a/www/views/layout.ejs b/www/views/layout.ejs
index ede8f5c..16d219d 100644
--- a/www/views/layout.ejs
+++ b/www/views/layout.ejs
@@ -116,6 +116,7 @@
     <script src="/js/ng/factory_dateConversion.js"></script>
     <script src="/js/ng/factory_config.js"></script>
     <script src="/js/ng/factory_devices.js"></script>
+    <script src="/js/ng/factory_docs.js"></script>
     <script src="/js/ng/factory_page.js"></script>
     <script src="/js/ng/factory_tags.js"></script>
     <script src="/js/ng/controller_config.js"></script>