diff --git a/blog/edit.html b/blog/edit.html
index cc59bc85645..f73ff8feef9 100755
--- a/blog/edit.html
+++ b/blog/edit.html
@@ -50,45 +50,56 @@
     </td>
 </tr>
 <tr>
-    <td>
-    <b><?php print_string('otags','blog'); ?></b>
+    <td align="right">
+        <strong><?php print_string('tags'); echo ':';?></strong>
     </td>
+
     <td>
-    <b><?php print_string('ptags','blog'); ?></b>
+        <table>
+            <tr>
+                <td>
+                <b><?php print_string('otags','blog'); ?></b>
+                </td>
+                <td>
+                <b><?php print_string('ptags','blog'); ?></b>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                <select name="otags[]" multiple="multiple" size="8">
+                <?php
+                    $otags = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'official\' ORDER by text ASC');
+                    foreach ($otags as $otag) {
+                        if (in_array($otag->id, $usedtags)) {
+                            echo '<option value="'.$otag->id.'" selected="selected">'.$otag->text.'</option>';
+                        } else {
+                            echo '<option value="'.$otag->id.'">'.$otag->text.'</option>';
+                        }
+                    }
+                ?>
+                </select>
+                </td>
+
+                <td>
+                <select name="ptags[]" multiple="multiple" size="8">
+                <?php
+                    $ptags = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'personal\' ORDER by text ASC');
+                    foreach ($ptags as $ptag) {
+                        if (in_array($ptag->id, $usedtags)) {
+                            echo '<option value="'.$ptag->id.'" selected="selected">'.$ptag->text.'</option>';
+                        } else {
+                            echo '<option value="'.$ptag->id.'">'.$ptag->text.'</option>';
+                        }
+                    }
+                ?>
+                </select>
+                </td>
+            </tr>
+        </table>
     </td>
 </tr>
 
-<tr>
-    <td>
-    <select name="otags[]" multiple="multiple" size="8">
-    <?php
-        $otags = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'official\' ORDER by text ASC');
-        foreach ($otags as $otag) {
-            if (in_array($otag->id, $usedtags)) {
-                echo '<option value="'.$otag->id.'" selected="selected">'.$otag->text.'</option>';
-            } else {
-                echo '<option value="'.$otag->id.'">'.$otag->text.'</option>';
-            }
-        }
-    ?>
-    </select>
-    </td>
-    
-    <td>
-    <select name="ptags[]" multiple="multiple" size="8">
-    <?php
-        $ptags = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'personal\' ORDER by text ASC');
-        foreach ($ptags as $ptag) {
-            if (in_array($ptag->id, $usedtags)) {
-                echo '<option value="'.$ptag->id.'" selected="selected">'.$ptag->text.'</option>';
-            } else {
-                echo '<option value="'.$ptag->id.'">'.$ptag->text.'</option>';
-            }
-        }
-    ?>
-    </select>
-    </td>
-</tr>
+
 
 <tr>
     <td>
diff --git a/blog/preferences.php b/blog/preferences.php
index 5f677911f98..3d1dcfc56ad 100755
--- a/blog/preferences.php
+++ b/blog/preferences.php
@@ -9,7 +9,7 @@
 
     // detemine where the user is coming from in case we need to send them back there
 
-    if (!$referrer = optional_param('referrer','', PARAM_NOTAGS)) {
+    if (!$referrer = optional_param('referrer','', PARAM_URL)) {
         if (isset($_SERVER['HTTP_REFERER'])) {
             $referrer = $_SERVER['HTTP_REFERER'];
         } else {