diff --git a/share/layout/html.tt b/share/layout/html.tt
index 4c77eb62d8..fb3c612b40 100644
--- a/share/layout/html.tt
+++ b/share/layout/html.tt
@@ -3,7 +3,6 @@
 <!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
 <!--[if IE 8]>    <html class="no-js lt-ie9" lang="en"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
-<html>
     <head>
         <meta charset="utf-8">
         <title>[% template.title or site_config.title %]</title>
diff --git a/share/templates/helpers/pref_table.tt b/share/templates/helpers/pref_table.tt
index dcff2e1eb3..d887f3d82c 100644
--- a/share/templates/helpers/pref_table.tt
+++ b/share/templates/helpers/pref_table.tt
@@ -1,4 +1,4 @@
-<style>
+<style type="text/css" scoped="scoped">
 .entry-disabled {
 	text-decoration: line-through;
 }
@@ -29,7 +29,7 @@
             <tr class="sw_action_row">
                 <td>
                     <a href="#" onclick="$.msgbox(
-                        '[% r.description | html %]',
+                        '[% r.description.squote | html %]',
                         {
                             type:'info', 
                             buttons:[
@@ -67,7 +67,7 @@
                 </td>
                 <td>
                     <div class="sw_actions pull-right" style="display:none;">
-                        <a style="display:inline;line-height:16px;" class="btn btn-small btn-primary" href="[% c.uri_for(helper.domain_id,'preferences', r.id, 'edit') %]"><i class="icon-edit" style="line-height:1em;margin-top:2px"></i> Edit</i></a>
+                        <a style="display:inline;line-height:16px;" class="btn btn-small btn-primary" href="[% c.uri_for(helper.domain_id,'preferences', r.id, 'edit') %]"><i class="icon-edit" style="line-height:1em;margin-top:2px"></i> Edit</a>
                     </div>
                 </td>
             </tr>
