diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index d39bfecd7..bdf2d5569 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -181,7 +181,7 @@ var padeditbar = (function()
     },
     redrawHeight: function(){
       var editbarHeight = $('.menu_left').height() + 2 + "px";
-      var containerTop = $('.menu_left').height() + 5 + "px";
+      var containerTop = $('.menu_left').height() + 7 + "px";
       $('#editbar').css("height", editbarHeight);
       $('#editorcontainer').css("top", containerTop);
     },
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index bf779d7ac..90bd9aa27 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -66,7 +66,12 @@ exports.getAvailablePlugins = function(maxCacheAge, cb) {
     if(exports.availablePlugins && maxCacheAge && Math.round(+new Date/1000)-cacheTimestamp <= maxCacheAge) {
       return cb && cb(null, exports.availablePlugins)
     }
-    plugins = JSON.parse(plugins);
+    try {
+      plugins = JSON.parse(plugins);
+    } catch (err) {
+      console.error('error parsing plugins.json:', err);
+      plugins = [];
+    }
     exports.availablePlugins = plugins;
     cacheTimestamp = Math.round(+new Date/1000);
     cb && cb(null, plugins)
diff --git a/src/templates/pad.html b/src/templates/pad.html
index b996ab6a5..f02670022 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -41,7 +41,11 @@
 
         <% e.begin_block("styles"); %>
         <link href="../static/css/pad.css" rel="stylesheet">
+
+        <% e.begin_block("customStyles"); %>
         <link href="../static/custom/pad.css" rel="stylesheet">
+        <% e.end_block(); %>
+
         <style title="dynamicsyntax"></style>
         <% e.end_block(); %>
 
@@ -345,7 +349,9 @@
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
 
+        <% e.begin_block("customScripts"); %>
         <script type="text/javascript" src="../static/custom/pad.js"></script>
+        <% e.end_block(); %>
 
         <!-- Bootstrap page -->
         <script type="text/javascript">