diff --git a/frontend/css/documentSourceView.css b/frontend/css/documentSourceView.css
index 98c26dc3fe..3b7e509b48 100644
--- a/frontend/css/documentSourceView.css
+++ b/frontend/css/documentSourceView.css
@@ -1,8 +1,11 @@
-#documentSourceBox {
-  min-height: 400px;
-  width: 885px;
-  border: 1px solid black;
-  border-radius: 0;
+#sourceEditor {
+  height: 400px;
+  width: 900px;
+  margin-left: 20px;
+  margin-top: 30px;
+  overflow:hidden;
+  padding-bottom: 20px;
+  border: 1px solid #A0A0A0;
 }
 
 #saveSourceDoc, #tableView {
@@ -25,3 +28,7 @@
   background-color: rgba(0, 0, 0, 0.05);
   
 }
+
+.sourceBox {
+  padding-bottom:20px;
+}
diff --git a/frontend/js/collections/arangoDocument.js b/frontend/js/collections/arangoDocument.js
index 9a00b1e9a0..75c7f89dd0 100644
--- a/frontend/js/collections/arangoDocument.js
+++ b/frontend/js/collections/arangoDocument.js
@@ -107,7 +107,8 @@ window.arangoDocument = Backbone.Collection.extend({
 
   saveDocument: function (view) {
     if (view === "source") {
-      var model = $('#documentSourceBox').val();
+      var editor = ace.edit("sourceEditor");
+      var model = editor.getValue();
       var tmp1 = window.location.hash.split("/")[2];
       var tmp2 = window.location.hash.split("/")[1];
       var docID = tmp2 + "/" + tmp1;
diff --git a/frontend/js/templates/documentSourceView.ejs b/frontend/js/templates/documentSourceView.ejs
index f311cd3fb0..1b28e83ed1 100644
--- a/frontend/js/templates/documentSourceView.ejs
+++ b/frontend/js/templates/documentSourceView.ejs
@@ -1,10 +1,9 @@
-<ul class="thumbnails2">
+<ul class="thumbnails2 sourceBox">
   <div id="transparentHeader">
     <img id="saveSourceDoc" class="plusIcon" class="pull-right" src="/_admin/html/img/saveIcon.png">
     <img id="tableView" class="plusIcon" class="pull-right" src="/_admin/html/img/tableView.png">
   </div>
+  <div id="sourceEditor">
+  </div>
 </ul>
 
-<div id="sourceDiv">
-  <textarea id="documentSourceBox" class="editBox"></textarea>
-</div>
diff --git a/frontend/js/views/documentSourceView.js b/frontend/js/views/documentSourceView.js
index 48e639b2d8..b9736f1794 100644
--- a/frontend/js/views/documentSourceView.js
+++ b/frontend/js/views/documentSourceView.js
@@ -12,8 +12,13 @@ var documentSourceView = Backbone.View.extend({
   render: function() {
     $(this.el).html(this.template.text);
     this.breadcrumb();
+    this.editor();
     return this;
   },
+  editor: function () {
+    var editor = ace.edit("sourceEditor");
+    editor.getSession().setMode("ace/mode/javascript");
+  },
   breadcrumb: function () {
     var name = window.location.hash.split("/");
     $('#transparentHeader').append(
@@ -39,7 +44,8 @@ var documentSourceView = Backbone.View.extend({
         delete data[key];
       }
     });
-    $('#documentSourceBox').val(this.FormatJSON(data));
+    var editor = ace.edit("sourceEditor");
+    editor.setValue(this.FormatJSON(data));
   },
   stateReplace: function (value) {
     var inString = false;
@@ -152,7 +158,7 @@ var documentSourceView = Backbone.View.extend({
       switch (self.RealTypeOf(vValue)) {
         case "array":
           case "object":
-          sHTML += FormatJSON(vValue, (sIndent + sIndentStyle));
+          sHTML += self.FormatJSON(vValue, (sIndent + sIndentStyle));
         break;
         case "boolean":
           case "number":
diff --git a/frontend/js/views/documentView.js b/frontend/js/views/documentView.js
index 2cdd27aa7f..cd69dacb37 100644
--- a/frontend/js/views/documentView.js
+++ b/frontend/js/views/documentView.js
@@ -138,7 +138,6 @@ var documentView = Backbone.View.extend({
           return ("<a class=\"sh_keyword\">" + value + "</a>");
         case 'object':
           if (value instanceof Array) {
-        window.arangoDocumentStore.saveDocument();
           return ("<a class=\"sh_array\">" + self.escaped(JSON.stringify(value)) + "</a>");
         }
         else {
diff --git a/frontend/js/views/documentView.js_BACKUP b/frontend/js/views/documentView.js_BACKUP
new file mode 100644
index 0000000000..109665ebfd
--- /dev/null
+++ b/frontend/js/views/documentView.js_BACKUP
@@ -0,0 +1,265 @@
+var documentView = Backbone.View.extend({
+  el: '#content',
+  table: '#documentTableID',
+  counter: 1,
+  init: function () {
+    this.initTable();
+  },
+
+  events: {
+    "click #saveDocument"    : "saveDocument",
+    "click #addDocumentLine" : "addLine",
+    "click #deleteRow"       : "deleteLine",
+    "click #sourceView"      : "sourceView"
+  },
+
+  template: new EJS({url: '/_admin/html/js/templates/documentView.ejs'}),
+
+  render: function() {
+    $(this.el).html(this.template.text);
+    this.breadcrumb();
+    return this;
+  },
+  sourceView: function () {
+    window.location.hash = window.location.hash + "/source";
+  },
+  saveDocument: function () {
+    window.arangoDocumentStore.saveDocument();
+  },
+  breadcrumb: function () {
+    var name = window.location.hash.split("/");
+    $('#transparentHeader').append(
+      '<a href="#" class="activeBread">Collections</a>'+
+      '  >  '+
+      '<a class="activeBread" href="#collection/'+name[1]+'/documents/1">'+name[1]+'</a>'+
+      '  >  '+
+      '<a class="disabledBread">'+name[2]+'</a>'
+    );
+  },
+  drawTable: function () {
+    var self = this;
+    $.each(window.arangoDocumentStore.models[0].attributes, function(key, value) {
+      if (self.isSystemAttribute(key)) {
+        $(self.table).dataTable().fnAddData(["", key, self.value2html(value, true), JSON.stringify(value)]);
+      }
+      else {
+        $(self.table).dataTable().fnAddData(['<button class="enabled" id="deleteRow"><img src="/_admin/html/img/delete_icon16.png" width="16" height="16"></button>',key, self.value2html(value), JSON.stringify(value)]);
+      }
+    });
+    this.makeEditable();
+  },
+
+  addLine: function () {
+    $(this.table).dataTable().fnAddData(['<button class="enabled" id="deleteRow"><img src="/_admin/html/img/delete_icon16.png" width="16" height="16"></button>', "somekey"+this.counter, this.value2html("editme"), JSON.stringify("editme")]);
+    this.makeEditable();
+    this.updateLocalDocumentStorage();
+    this.counter++;
+  },
+
+  deleteLine: function (a) {
+    var row = $(a.currentTarget).closest("tr").get(0);
+    $(this.table).dataTable().fnDeleteRow($(this.table).dataTable().fnGetPosition(row));
+    this.updateLocalDocumentStorage();
+  },
+
+  initTable: function () {
+    var documentTable = $(this.table).dataTable({
+      "aaSorting": [[ 1, "asc" ]],
+      "bAutoWidth": false,
+      "bFilter": false,
+      "bPaginate":false,
+      "bSortable": false,
+      "bLengthChange": false,
+      "bDeferRender": true,
+      "iDisplayLength": -1,
+      "aoColumns": [
+        {"sClass":"read_only leftCell", "bSortable": false, "sWidth": "30px"},
+        {"sClass":"writeable", "bSortable": false, "sWidth":"400px" },
+        {"sClass":"writeable rightCell", "bSortable": false},
+        {"bVisible": false }
+      ],
+      "oLanguage": {"sEmptyTable": "No documents"}
+    });
+  },
+
+  systemAttributes: function () {
+    return {
+      '_id' : true,
+      '_rev' : true,
+      '_key' : true,
+      '_from' : true,
+      '_to' : true,
+      '_bidirectional' : true,
+      '_vertices' : true,
+      '_from' : true,
+      '_to' : true,
+      '$id' : true
+    };
+  },
+
+  isSystemAttribute: function (val) {
+    var a = this.systemAttributes();
+    return a[val];
+  },
+
+  isSystemCollection: function (val) {
+    return val && val.name && val.name.substr(0, 1) === '_';
+  },
+
+  value2html: function (value, isReadOnly) {
+    var self = this;
+    var typify = function (value) {
+      var checked = typeof(value);
+      switch(checked) {
+        case 'number':
+          return ("<a class=\"sh_number\">" + value + "</a>");
+        case 'string':
+          return ("<a class=\"sh_string\">" + self.escaped(value) + "</a>");
+        case 'boolean':
+          return ("<a class=\"sh_keyword\">" + value + "</a>");
+        case 'object':
+          if (value instanceof Array) {
+        window.arangoDocumentStore.saveDocument();
+          return ("<a class=\"sh_array\">" + self.escaped(JSON.stringify(value)) + "</a>");
+        }
+        else {
+          return ("<a class=\"sh_object\">"+ self.escaped(JSON.stringify(value)) + "</a>");
+        }
+      }
+    };
+    return (isReadOnly ? "(read-only) " : "") + typify(value);
+  },
+
+  escaped: function (value) {
+      return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#38;");
+  },
+
+  updateLocalDocumentStorage: function () {
+    var data = $(this.table).dataTable().fnGetData();
+    var result = {};
+
+    for (row in data) {
+      var row_data = data[row];
+      result[row_data[1]] = JSON.parse(row_data[3]);
+    }
+    window.arangoDocumentStore.updateLocalDocument(result);
+    this.saveDocument();
+  },
+
+  makeEditable: function () {
+    var documentEditTable = $(this.table).dataTable();
+    var self=this;
+    var i = 0;
+    $('.writeable', documentEditTable.fnGetNodes() ).each(function () {
+      if ( i == 1) {
+        $(this).removeClass('writeable');
+        i = 0;
+      }
+      if (self.isSystemAttribute(this.innerHTML)) {
+        $(this).removeClass('writeable');
+        i = 1;
+      }
+    });
+    $('.writeable', documentEditTable.fnGetNodes()).editable(function(value, settings) {
+      var aPos = documentEditTable.fnGetPosition(this);
+      if (aPos[1] == 1) {
+        documentEditTable.fnUpdate(value, aPos[0], aPos[1]);
+        self.updateLocalDocumentStorage();
+        return value;
+      }
+      if (aPos[1] == 2) {
+        var oldContent = JSON.parse(documentEditTable.fnGetData(aPos[0], aPos[1] + 1));
+        var test = self.getTypedValue(value);
+        if (String(value) == String(oldContent)) {
+          // no change
+          return self.value2html(oldContent);
+        }
+        else {
+          // change update hidden row
+          documentEditTable.fnUpdate(JSON.stringify(test), aPos[0], aPos[1] + 1);
+          self.updateLocalDocumentStorage();
+          // return visible row
+          return self.value2html(test);
+        }
+      }
+    },{
+      data: function() {
+        var aPos = documentEditTable.fnGetPosition(this);
+        var value = documentEditTable.fnGetData(aPos[0], aPos[1]);
+
+        if (aPos[1] == 1) {
+          return value;
+        }
+        if (aPos[1] == 2) {
+          var oldContent = documentEditTable.fnGetData(aPos[0], aPos[1] + 1);
+          if (typeof(oldContent) == 'object') {
+            //grep hidden row and paste in visible row
+            return value2html(oldContent);
+          }
+          else {
+            return oldContent;
+          }
+        }
+      },
+      //type: 'textarea',
+      type: "autogrow",
+      tooltip: 'click to edit',
+      cssclass : 'jediTextarea',
+      submit: 'Okay',
+      cancel: 'Cancel',
+      onblur: 'cancel',
+      //style: 'display: inline',
+      autogrow: {lineHeight: 16, minHeight: 30}
+    });
+  },
+  getTypedValue: function (value) {
+    value = value.replace(/(^\s+|\s+$)/g, '');
+    if (value == 'true') {
+      return true;
+    }
+    if (value == 'false') {
+      return false;
+    }
+    if (value == 'null') {
+      return null;
+    }
+    if (value.match(/^-?((\d+)?\.)?\d+$/)) {
+      // TODO: support exp notation
+      return parseFloat(value);
+    }
+
+    try {
+      // assume list or object
+      var test = JSON.parse(value);
+      if (test instanceof Array) {
+        // value is an array
+        return test;
+      }
+      if (typeof(test) == 'object') {
+        // value is an object 
+        return test;
+      }
+    }
+    catch (err) {
+    }
+
+    // fallback: value is a string
+    value = value + '';
+
+    if (value !== '' && (value.substr(0, 1) != '"' || value.substr(-1) != '"')) {
+      alert("You have entered an invalid string value. Please review and adjust it.");
+      throw "error";
+    }
+
+    try {
+      value = JSON.parse(value);
+    }
+    catch (e) {
+      alert("You have entered an invalid string value. Please review and adjust it.");
+      throw e;
+    }
+    return value;
+  }
+
+
+});
diff --git a/frontend/js/views/documentsView.js b/frontend/js/views/documentsView.js
index 38e6fcc88c..a657178ca6 100644
--- a/frontend/js/views/documentsView.js
+++ b/frontend/js/views/documentsView.js
@@ -115,7 +115,6 @@ var documentsView = Backbone.View.extend({
       ]);
     });
     $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false});
-    console.log(this);
     $(".prettify").tooltip({
       placement: "top"
     });