diff --git a/plugins/box/emails/emails.admin.php b/plugins/box/emails/emails.admin.php
index 770049c..e2d0e6b 100644
--- a/plugins/box/emails/emails.admin.php
+++ b/plugins/box/emails/emails.admin.php
@@ -48,11 +48,11 @@ class EmailsAdmin extends Backend
 
                     }
 
-                    $email_template_content = File::getContent($email_templates_path.Request::get('filename').'.email.php');
+                    $content = File::getContent($email_templates_path.Request::get('filename').'.email.php');
 
                     // Display view
                     View::factory('box/emails/views/backend/edit')
-                            ->assign('email_template_content', Text::toHtml($email_template_content))                    
+                            ->assign('content', $content)
                             ->display();
                 break;
 
diff --git a/plugins/box/emails/views/backend/edit.view.php b/plugins/box/emails/views/backend/edit.view.php
index a45beaa..4492492 100644
--- a/plugins/box/emails/views/backend/edit.view.php
+++ b/plugins/box/emails/views/backend/edit.view.php
@@ -1,7 +1,7 @@
 <h2><?php echo __('Edit Email Template', 'emails'); ?></h2>
 <br>
 <?php   
-if ($email_template_content !== null) {
+if ($content !== null) {
     echo (Form::open());
     echo (Form::hidden('csrf', Security::token()));
     echo (Form::hidden('email_template_name', Request::get('filename')));
@@ -15,7 +15,7 @@ if ($email_template_content !== null) {
 
     echo (        
        Form::label('content', __('Email template content', 'emails')).
-       Form::textarea('content', Html::toText($email_template_content), array('style' => 'width:100%;height:400px;', 'class' => 'source-editor form-control'))
+       Form::textarea('content', Html::toText($content), array('style' => 'width:100%;height:400px;', 'class' => 'source-editor form-control'))
     );
 
     echo (
diff --git a/plugins/box/emails/views/backend/index.view.php b/plugins/box/emails/views/backend/index.view.php
index 7a22ca4..946b423 100644
--- a/plugins/box/emails/views/backend/index.view.php
+++ b/plugins/box/emails/views/backend/index.view.php
@@ -2,6 +2,14 @@
     <div class="pull-left">
         <h2><?php echo __('Emails', 'emails'); ?></h2>
     </div>    
+    <div class="pull-right">
+        <br>
+        <?php
+            echo (
+                Html::anchor(__('Edit Layout', 'emails'), 'index.php?id=emails&action=edit_email_template&filename=layout', array('title' => __('Edit Layout', 'emails'), 'class' => 'btn btn-primary'))
+            );
+        ?>
+    </div>
     <div class="clearfix"></div>
 </div>
 
@@ -16,16 +24,18 @@
     </thead>
     <tbody>
     <?php if (count($email_templates_list) != 0) foreach ($email_templates_list as $email_template) { ?>
-    <tr>
-        <td><?php echo basename($email_template, '.email.php'); ?></td>
-        <td>
-            <div class="pull-right">            
-                <div class="btn-group">
-                    <?php echo Html::anchor(__('Edit', 'emails'), 'index.php?id=emails&action=edit_email_template&filename='.basename($email_template, '.email.php'), array('class' => 'btn btn-primary')); ?>
-                </div>         
-            </div>
-        </td>
-    </tr>
+        <?php if ($email_template != 'layout.email.php') { ?>
+        <tr>
+            <td><?php echo basename($email_template, '.email.php'); ?></td>
+            <td>
+                <div class="pull-right">            
+                    <div class="btn-group">
+                        <?php echo Html::anchor(__('Edit', 'emails'), 'index.php?id=emails&action=edit_email_template&filename='.basename($email_template, '.email.php'), array('class' => 'btn btn-primary')); ?>
+                    </div>         
+                </div>
+            </td>
+        </tr>
+        <?php } ?>
     <?php } ?>
     </tbody>
 </table>
diff --git a/plugins/box/emails/views/emails/email_layout.view.php b/plugins/box/emails/views/emails/email_layout.view.php
index 32ba544..e2952d0 100644
--- a/plugins/box/emails/views/emails/email_layout.view.php
+++ b/plugins/box/emails/views/emails/email_layout.view.php
@@ -1,22 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width"/>
-
-    <style type="text/css">
-      <?php include PLUGINS_BOX . '/emails/css/inc.css'; ?>   
-    </style>
-  </head>
-  <body>
-    <table class="body">
-      <tr>
-        <td class="center" align="center" valign="top">
-          <center>
-            <?php include STORAGE . DS . 'emails' . DS . $email_template . '.email.php'; ?>
-          </center>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
+<?php include STORAGE . DS . 'emails' . DS . 'layout.email.php'; ?>
\ No newline at end of file