diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index c1052be2aa5f6ea2499314dcf033125755cf619f..1a7316aa961b27f4a081c3f1d146ba5077ace76f 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -87,7 +87,7 @@ else
                     <a href="canned.php?id=<?php echo $row['canned_id']; ?>"><?php echo Format::truncate($row['title'],200); echo "&nbsp;$files"; ?></a>&nbsp;
                 </td>
                 <td><?php echo $row['isenabled']?'Active':'<b>Disabled</b>'; ?></td>
-                <td><?php echo $row['department']?$row['department']:'-- All Departments --'; ?></td>
+                <td><?php echo $row['department']?$row['department']:'&mdash; All Departments &mdash;'; ?></td>
                 <td>&nbsp;<?php echo Format::db_datetime($row['updated']); ?></td>
             </tr>
             <?php
diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index 22c19bdd921103bf10b948c4a339c9c678c10099..1d44df3ef2de432e915156f91670a899a8cc4be0 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -65,7 +65,7 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".
     <form action="directory.php" method="GET" name="filter">
        <input type="text" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>" >
         <select name="did" id="did">
-             <option value="0">&mdash; All Department &mdash;</option>
+             <option value="0">&mdash; All Departments &mdash;</option>
              <?php
              $sql='SELECT dept.dept_id, dept.dept_name,count(staff.staff_id) as users  '.
                   'FROM '.DEPT_TABLE.' dept '.
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index 0ab2ec09449a07f8f7efa78f8602683534b7666a..726c822f617e19bc4983cabcccbe19c9977f28d3 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -10,7 +10,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
         <tr>
             <th colspan="2">
                 <h4>Knowledge Base Settings</h4>
-                <em>Disabling knowledge base disables clients'interface.</em>
+                <em>Disabling knowledge base disables clients' interface.</em>
             </th>
         </tr>
     </thead>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 04bd90d604e5a6265b159e49279792db58fbe4ef..8fd39dd21f6e539df9442f20006a8e8f8720ede1 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1083,15 +1083,14 @@ h2 .reload {
 #kbSearch div {
     clear:both;
     overflow:hidden;
-    padding-top:5px;
+    padding:5px 0 2px 3px;
 }
 
 #kbSearch #query {
-    margin:0;
+    margin:1px 5px 0 0;
     display:inline-block;
     float:left;
     width:200px;
-    margin-right:5px;
 }
 
 #kbSearch #cid {