diff --git a/module/api/css/createlib.css b/module/api/css/createlib.css
index afd4e4895c..4b4ded1749 100644
--- a/module/api/css/createlib.css
+++ b/module/api/css/createlib.css
@@ -1,5 +1,5 @@
 .modal-dialog {width: 75%;}
-form {margin-bottom: 100px; padding-left: 65px;}
+form {margin-bottom: 100px;}
 table {width: 90% !important;}
 #whiteListBox div.input-group {margin-bottom: 2px;}
 #whiteListBox .input-group:last-child {margin-top: 10px;}
diff --git a/module/api/view/createlib.html.php b/module/api/view/createlib.html.php
index bba6bf97c8..f7bd8f3ffa 100644
--- a/module/api/view/createlib.html.php
+++ b/module/api/view/createlib.html.php
@@ -75,7 +75,7 @@
               </td>
             </tr>
             <tr>
-              <td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
+              <td class='text-center form-actions' colspan='3'><?php echo html::submitButton();?></td>
             </tr>
           </table>
         </form>
diff --git a/module/doc/control.php b/module/doc/control.php
index cfbefa5c4d..9296e6e0a8 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -137,11 +137,11 @@ class doc extends control
                 $this->action->create('docLib', $libID, 'Created');
 
                 if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $libID));
-                return print(js::locate($this->createLink('doc', 'tableContents', "type=$type&objectID=$objectID&libID=$libID"), 'parent.parent'));
+                return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.locateNewLib(\"$type\", \"$objectID\", \"$libID\")"));
             }
             else
             {
-                echo js::error(dao::getError());
+                return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             }
         }
 
diff --git a/module/doc/css/editlib.css b/module/doc/css/editlib.css
index 2acde0e1ba..a65e90f85a 100644
--- a/module/doc/css/editlib.css
+++ b/module/doc/css/editlib.css
@@ -3,5 +3,4 @@ form {margin-right: 30px;}
 #whiteListBox div.input-group {margin-bottom: 2px;}
 #whiteListBox .input-group:last-child {margin-top: 10px;}
 
-.center-block {margin-top: 20px;}
 #groups_chosen.chosen-container .chosen-results, #users_chosen.chosen-container .chosen-results {max-height: 160px;}
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index c4d2edfc56..6e561d4623 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -311,3 +311,8 @@ $(document).ready(function()
         return false;
     });
 });
+
+function locateNewLib(type, objectID, libID)
+{
+    location.href = createLink('doc', 'tableContents', 'type=' + type + '&objectID=' + objectID + '&libID=' + libID);
+}
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index ae16a21cb1..4ab6346089 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -20,7 +20,7 @@
         <div class='main-header'>
           <h2><?php echo $lang->doc->createLib;?></h2>
         </div>
-        <form method='post' target='hiddenwin' class='no-stash'>
+        <form method='post' class='main-form form-ajax no-stash' enctype='multipart/form-data' >
           <table class='table table-form'>
             <?php if(in_array($type, array('product', 'project', 'execution'))):?>
             <tr class='objectBox'>