diff --git a/Views/dashboard_config.php b/Views/dashboard_config.php
index 97d3260..503bfb3 100644
--- a/Views/dashboard_config.php
+++ b/Views/dashboard_config.php
@@ -9,6 +9,7 @@
     http://openenergymonitor.org
     */
     global $path;
+    defined('EMONCMS_EXEC') or die('Restricted access');
 ?>
 
 <div id="dashConfigModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="dashConfigModalLabel" aria-hidden="true" data-backdrop="static">
diff --git a/Views/dashboard_edit_view.php b/Views/dashboard_edit_view.php
index 331d404..7ca35fb 100644
--- a/Views/dashboard_edit_view.php
+++ b/Views/dashboard_edit_view.php
@@ -9,6 +9,7 @@
 http://openenergymonitor.org
 */
 
+defined('EMONCMS_EXEC') or die('Restricted access');
 global $session,$path;
 
 load_language_files("Modules/vis/locale", "vis_messages");
@@ -178,4 +179,4 @@ function showSuccess() {
     $(window).resize(function(){
         designer.draw();
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/Views/dashboard_list.old.php b/Views/dashboard_list.old.php
deleted file mode 100644
index 99b584c..0000000
--- a/Views/dashboard_list.old.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-    global $path;
-    load_language_files("Modules/dashboard/locale", "dashboard_messages");
-?>
-
-<script type="text/javascript" src="<?php echo $path; ?>Modules/dashboard/dashboard.js"></script>
-<script type="text/javascript" src="<?php echo $path; ?>Lib/tablejs/table.js"></script>
-<script type="text/javascript" src="<?php echo $path; ?>Lib/tablejs/custom-table-fields.js"></script>
-<style>
-#table input[type="text"] {
-     width: 88%;
-}
-</style>
-
-<div class="container">
-    <div id="localheading"><h2><?php echo dgettext('dashboard_messages','Dashboards'); ?></h2></div>
-
-    <div id="nodashboards" class="alert alert-block hide">
-        <h4 class="alert-heading"><?php echo dgettext('dashboard_messages','No dashboards created'); ?></h4>
-        <p><?php echo dgettext('dashboard_messages','Maybe you would like to add your first dashboard using the button bellow.') ?></p>
-    </div>
-
-    <div id="table"><div>loading...</div></div>
-
-    <div id="bottomtoolbar" class="hide"><hr>
-        <button id="addnewdashboard" class="btn btn-small"><i class="icon-plus-sign" ></i>&nbsp;<?php echo _("New"); ?></button>
-    </div>
-</div>
-
-<div id="myModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static">
-    <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h3 id="myModalLabel"><?php echo dgettext('dashboard_messages','Delete dashboard') ?></h3>
-    </div>
-    <div class="modal-body">
-        <p><?php echo dgettext('dashboard_messages','Deleting a dashboard is permanent.'); ?>
-           <br><br>
-           <?php echo dgettext('dashboard_messages','Are you sure you want to delete?'); ?>
-        </p>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true"><?php echo dgettext('dashboard_messages','Cancel'); ?></button>
-        <button id="confirmdelete" class="btn btn-primary"><?php echo dgettext('dashboard_messages','Delete permanently'); ?></button>
-    </div>
-</div>
-
-<script>
-  // Extend table library field types
-  for (z in customtablefields) table.fieldtypes[z] = customtablefields[z];
-
-  table.element = "#table";
-
-  table.fields = {
-    'id':{'title':"<?php echo dgettext('dashboard_messages','Id'); ?>", 'type':"fixed"},
-    'name':{'title':"<?php echo dgettext('dashboard_messages','Name'); ?>", 'type':"text"},
-    'alias':{'title':"<?php echo dgettext('dashboard_messages','Alias'); ?>", 'type':"text"},
-     // 'description':{'title':"<?php echo dgettext('dashboard_messages','Description'); ?>", 'type':"text"},
-    'main':{'title':"<?php echo dgettext('dashboard_messages','Default'); ?>", 'type':"icon", 'trueicon':"icon-star", 'falseicon':"icon-star-empty"},
-    'public':{'title':"<?php echo dgettext('dashboard_messages','Public'); ?>", 'type':"icon", 'trueicon':"icon-globe", 'falseicon':"icon-lock"},
-    // 'published':{'title':"<?php echo dgettext('dashboard_messages','Bookmarked'); ?>", 'type':"icon", 'trueicon':"icon-ok", 'falseicon':"icon-remove"},
-
-    // Actions
-    'clone-action':{'title':'', 'type':"iconbasic", 'icon':'icon-random'},
-    'edit-action':{'title':'', 'type':"edit"},
-    'delete-action':{'title':'', 'type':"delete"},
-    'draw-action':{'title':'', 'type':"iconlink", 'icon':"icon-edit", 'link':path+"dashboard/edit?id="},
-    'view-action':{'title':'', 'type':"iconlink", 'link':path+"dashboard/view?id="}
-  }
-
-  table.deletedata = false;
-
-  update();
-
-  function update() {
-    table.data = dashboard.list();
-    table.draw();
-    if (table.data.length != 0) {
-      $("#nodashboards").hide();
-      //$("#localheading").show();
-      $("#bottomtoolbar").show();
-    } else {
-      $("#nodashboards").show();
-      //$("#localheading").hide();
-      $("#bottomtoolbar").show();
-    };
-  }
-
-  $("#table").bind("onEdit", function(e){});
-
-  $("#table").bind("onSave", function(e,id,fields_to_update){
-    var result = dashboard.set(id,fields_to_update);
-    if (result.success!=undefined) {
-        if (!result.success) alert(result.message);
-    }
-    if (fields_to_update.main) update();
-  });
-
-  $("#table").bind("onDelete", function(e,id,row){
-    $('#myModal').modal('show');
-    $('#myModal').attr('feedid',id);
-    $('#myModal').attr('feedrow',row);
-  });
-
-  $("#confirmdelete").click(function(){
-    var id = $('#myModal').attr('feedid');
-    var row = $('#myModal').attr('feedrow');
-    dashboard.remove(id);
-    table.remove(row);
-    update();
-
-    $('#myModal').modal('hide');
-  });
-  
-  $("#addnewdashboard").click(function(){
-    dashboard.add(); 
-    update();
-  });
-
-  // UI js
-  $("#table").on('click', '.icon-random', function() {
-    var i = table.data[$(this).attr('row')];
-    var result = dashboard.clone(i['id']);
-    update();
-  });
-</script>
diff --git a/Views/dashboard_list.php b/Views/dashboard_list.php
index 7d8099d..16d9cad 100644
--- a/Views/dashboard_list.php
+++ b/Views/dashboard_list.php
@@ -1,3 +1,7 @@
+<?php
+defined('EMONCMS_EXEC') or die('Restricted access');
+?>
+
 <style>
     #app {
         max-width: 990px;
diff --git a/Views/dashboard_menu.php b/Views/dashboard_menu.php
index 0558add..46dd7f7 100644
--- a/Views/dashboard_menu.php
+++ b/Views/dashboard_menu.php
@@ -8,22 +8,3 @@
     Part of the OpenEnergyMonitor project:
     http://openenergymonitor.org
 */
-
-    global $path;
-
-    $result = "";
-
-/*
-    if ($type=="view" && isset($id)) {
-        $result .= "<a class='btn btn-mini' href='" . $path . "dashboard/edit?id=" . $id . "'><span class='icon-edit' title='" . _("Draw Editor") . "'></span></a>";
-    }
-*/
-
-    //CHAVEIRO: Removed, dashboard list is accessible via setup menu now
-    //if ($type!="list") {
-    //    $result .= "<a class='btn btn-mini' href='" . $path . "dashboard/list'><span class='icon-th-list' title='" . _('List view') ."'></span></a>";
-    //}
-
-    if ($result) {
-        echo "<div class='btn-toolbar' style='padding:2px; margin: 0;' align='right'><div class='btn-group'>".$result."</div></div>";   
-    }
diff --git a/Views/dashboard_view.php b/Views/dashboard_view.php
index e7a5edb..7fed44e 100644
--- a/Views/dashboard_view.php
+++ b/Views/dashboard_view.php
@@ -8,6 +8,7 @@
 Part of the OpenEnergyMonitor project:
 http://openenergymonitor.org
 */
+defined('EMONCMS_EXEC') or die('Restricted access');
 
 global $session,$path,$dashboard_editor_icon,$embed;
 
diff --git a/Views/loadwidgets.php b/Views/loadwidgets.php
index c4a003c..b3fe0ab 100644
--- a/Views/loadwidgets.php
+++ b/Views/loadwidgets.php
@@ -10,6 +10,8 @@
     http://openenergymonitor.org
 
     */
+
+    defined('EMONCMS_EXEC') or die('Restricted access');
     
     define("MODULE_PATH","Modules");
     echo "<script type='application/javascript'>var requestTime = Date.now() /1000;var offsetofTime = 0;offsetofTime = Math.round(requestTime - ".time()."); // Offset in s from local to server time</script>";
diff --git a/dashboard b/dashboard
deleted file mode 120000
index ef360c8..0000000
--- a/dashboard
+++ /dev/null
@@ -1 +0,0 @@
-dashboard
\ No newline at end of file
diff --git a/module.json b/module.json
index 9452aa4..170e328 100644
--- a/module.json
+++ b/module.json
@@ -1,6 +1,6 @@
 {
     "name"         : "Dashboard",
-    "version"      : "2.1.3",
+    "version"      : "2.1.4",
     "location"     : "/var/www/emoncms/Modules",
     "branches_available": ["stable","master"]
 }