Okay, this is the last superficial commit

classes/rules.class.php

    */
   public static function display_golden_rules() {
     ?>
-    <ol>
+    <ul>
       <li>Staff can do anything to anyone for any reason (or no reason). If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site.</li>
       <li>One account per person per lifetime.</li>
       <li>Follow proper private BitTorrent practices. Torrent files you download from this site are unique to you and should not be shared with others. Torrent files from this site should not be modified by adding additional trackers or enabling DHT or PEX under any circumstances.</li>
       <li>Accessing the site from any IP address is permitted, but your account will be linked with other accounts that have accessed the site from the same IP as you. As such, it is <em>recommended</em> that you don't use public networks, proxies, or VPNs to access the site.</li>
       <li>Attempting to find a bug in the site code is allowed and sometimes even rewarded. Follow proper disclosure procedures by contacting staff about the issue well before disclosing it publicly. Do not misuse any bugs you may discover. Do not attempt to portray abuse as a bug in the hopes of a reward.</li>
       <li>Don't reveal the criteria for hidden badges or events.</li>
-    </ol>
+    </ul>
 <?
   }
 
         <ul>
       <li>Let's treat the biology boards like how the Shroomery used to be: each thread a set of resourceful diverse wisdom worth using permalinks to. It's okay if the boards are slow, that's why there are only a few of them.</li>
       <li>Please discuss site news in the corresponding Announcements thread instead of making a new General thread. Discussing science-related news in General is highly encouraged, but discussing political news is much less so. Thank you.</li>
-      <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a financial instrument. You're banned on the spot. The exceptions: cryptocurrencies that derive their value from work performed on distributed science computation networks, e.g., Curecoin, FoldingCoin, and Gridcoin.</li>
+      <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a financial instrument. You'll be banned on the spot. The exceptions: cryptocurrencies that derive their value from work performed on distributed science computation networks, e.g., Curecoin, FoldingCoin, and Gridcoin.</li>
       <li>Feel free to post announcements for your own projects, even and especially if they're commercial ones, in the General board. Limit all discussion of trading biomaterials, including bulk giveaways, to the Marketplace forum available to Power Users.</li>
       <li>Please be modest when talking about your uploads. It's unnecessary to announce your uploads because Gazelle logs everything (at least one this is encrypted). If someone asks for help on his project and your upload fits the bill, go write a post!</li>
       <li>Use descriptive and specific subject lines. This helps others decide whether your particular words of "wisdom" relate to a topic they care about.</li>
       <li>Don't send mass alerts with <code>@channel</code>, <code>@everyone</code>, or <code>@here</code>. It's obnoxious and you should handle anything genuinely important on the boards.</li>
       <li>Flooding is irritating and you'll get kicked for it. This includes "now playing" scripts, large amounts of irrelevant text such as lorem ipsum, and unfunny non sequiturs.</li>
       <li>Impersonating other members &mdash; particularly staff members &mdash; will not go unpunished. Please remember that the Slack channels are publicly accessible.</li>
-      <li>Please use the threaded conversation in Slack and avoid replying to threads with new messages or crossposting replies to the main channel.</li>
+      <li>Please use the threaded conversations feature in Slack and avoid replying to threads with new messages or crossposting replies to the main channel.</li>
       <li>Announce and bot channels are in development, as standard IRC instead of Slack for obvious reasons. Any IRC bots you have must authenticate with your own username and IRC key, and set the <code>+B</code> usermode on themselves.</li>
 <?
   }

sections/register/closed.php

-<?
+<?php
 View::show_header('Registration Closed');
 ?>
-<div style="width: 500px;">
-  <strong>Sorry, the site is currently invite only.</strong>
+
+<div style="width: 250px;">
+  <p><strong>Sorry, the site is currently invite only.</strong></p>
 </div>
-<?
+
+<?php
 View::show_footer();
-?>

sections/rules/upload.php

   <form class="search_form" name="rules" onsubmit="return false" action="">
     <input type="text" id="search_string" value="Filter (empty to reset)" />
     <span id="Index">Searching for <strong>upload</strong> returns all rules containing that term.
-      Searching for <strong>upload+trump</strong> returns all rules containing both terms</span>
+      Searching for <strong>upload+trump</strong> returns all rules containing both terms.</span>
   </form>
   <br />
   <div class="before_rules">

sections/torrents/user.php

 
 <div class="thin">
   <div class="header">
-    <h2><a href="user.php?id=<?= $UserID ?>"><?= $User['Username'] ?></a><?= "'s $Action torrents" ?></h2>
+    <h2><a href="user.php?id=<?= $UserID ?>"><?= $User['Username'] ?></a><?= "'s $Action torrents" ?>
+    </h2>
   </div>
   <div class="box pad">
     <form class="search_form" name="torrents" action="" method="get">
         <tr>
           <td class="label"><strong>Search Terms</strong></td>
           <td>
-            <input type="hidden" name="type" value="<?= $_GET['type'] ?>" />
-            <input type="hidden" name="userid" value="<?= $UserID ?>" />
-            <input type="search" name="search" size="60" value="<?php Format::form('search') ?>" />
+            <input type="hidden" name="type"
+              value="<?= $_GET['type'] ?>" />
+            <input type="hidden" name="userid"
+              value="<?= $UserID ?>" />
+            <input type="search" name="search" size="60"
+              value="<?php Format::form('search') ?>" />
           </td>
         </tr>
 
-        <!-- Specifics -->
+        <!--
+        Specifics
+        todo: Make like the Seq/Img Format fields in browse.php
+        -->
         <tr>
           <td class="label"><strong>Specifics</strong></td>
           <td class="nobr" colspan="3">
             <select id="container" name="container" class="ft_container">
               <option value="">Format</option>
-              <?php foreach ($Containers as $ContainerName) { ?>
-              <option value="<?= display_str($ContainerName); ?>"<?php Format::selected('container', $ContainerName) ?>><?= display_str($ContainerName); ?>
+              <?php foreach ($Containers as $Key => $ContainerName) { ?>
+              <option value="<?= display_str($Key); ?>" <?php Format::selected('container', $Key) ?>><?= display_str($Key); ?>
               </option>
               <?php } ?>
             </select>
             <select id="codec" name="codec" class="ft_codec">
               <option value="">License</option>
               <?php foreach ($Codecs as $CodecName) { ?>
-              <option value="<?= display_str($CodecName); ?>"<?php Format::selected('codec', $CodecName) ?>><?= display_str($CodecName); ?>
+              <option value="<?= display_str($CodecName); ?>" <?php Format::selected('codec', $CodecName) ?>><?= display_str($CodecName); ?>
               </option>
               <?php } ?>
             </select>
             <select id="resolution" name="resolution" class="ft_resolution">
               <option value="">Assembly Level</option>
               <?php foreach ($Resolutions as $ResolutionName) { ?>
-              <option value="<?= display_str($ResolutionName); ?>"<?php Format::selected('resolution', $ResolutionName) ?>><?= display_str($ResolutionName); ?>
+              <option value="<?= display_str($ResolutionName); ?>"
+                <?php Format::selected('resolution', $ResolutionName) ?>><?= display_str($ResolutionName); ?>
               </option>
               <?php } ?>
             </select>
             <select name="media" class="ft_media">
               <option value="">Platform</option>
               <?php foreach ($Media as $MediaName) { ?>
-              <option value="<?= display_str($MediaName); ?>"<?php Format::selected('media', $MediaName) ?>><?= display_str($MediaName); ?>
+              <option value="<?= display_str($MediaName); ?>" <?php Format::selected('media', $MediaName) ?>><?= display_str($MediaName); ?>
               </option>
               <?php } ?>
             </select>
           <td class="nobr" colspan="3">
             <select name="censored" class="ft_censored">
               <option value="3">Alignment</option>
-              <option value="1"<?Format::selected('censored', 1)?>>Aligned</option>
-              <option value="0"<?Format::selected('censored', 0)?>>Unaligned</option>
+              <option value="1" <?Format::selected('censored', 1)?>>Aligned
+              </option>
+              <option value="0" <?Format::selected('censored', 0)?>>Unaligned
+              </option>
             </select>
           </td>
         </tr>
         <tr>
           <td class="label"><strong>Tags</strong></td>
           <td>
-            <input type="search" name="tags" size="60" value="<?php Format::form('tags') ?>" />&nbsp;
-            <input type="radio" name="tags_type" id="tags_type0" value="0"<?php Format::selected('tags_type', 0, 'checked') ?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
-            <input type="radio" name="tags_type" id="tags_type1" value="1"<?php Format::selected('tags_type', 1, 'checked') ?> /><label for="tags_type1"> All</label><br />
+            <input type="search" name="tags" size="60"
+              value="<?php Format::form('tags') ?>" />&nbsp;
+            <input type="radio" name="tags_type" id="tags_type0" value="0" <?php Format::selected('tags_type', 0, 'checked') ?>
+            /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
+            <input type="radio" name="tags_type" id="tags_type1" value="1" <?php Format::selected('tags_type', 1, 'checked') ?>
+            /><label for="tags_type1"> All</label><br />
             Use !tag to exclude tags
           </td>
         </tr>
           <td>
             <select name="order" class="ft_order_by">
               <?php foreach ($Orders as $OrderText) { ?>
-              <option value="<?= $OrderText ?>"<?php Format::selected('order', $OrderText) ?>><?= $OrderText ?>
+              <option value="<?= $OrderText ?>" <?php Format::selected('order', $OrderText) ?>><?= $OrderText ?>
               </option>
               <?php } ?>
             </select>
 
             <select name="way" class="ft_order_way">
               <?php foreach ($Ways as $WayKey=>$WayText) { ?>
-              <option value="<?= $WayKey ?>"<?php Format::selected('way', $WayKey) ?>><?= $WayText ?>
+              <option value="<?= $WayKey ?>" <?php Format::selected('way', $WayKey) ?>><?= $WayText ?>
               </option>
               <?php } ?>
             </select>
 
       <!-- Categories -->
       <table class="layout cat_list">
-<?php
+        <?php
 $x = 0;
 reset($Categories);
 foreach ($Categories as $CatKey => $CatName) {
         if ($x > 0) {
             ?>
         </tr>
-<?php
+        <?php
         } ?>
         <tr>
-<?php
+          <?php
     }
     $x++; ?>
           <td>
-            <input type="checkbox" name="categories[<?= ($CatKey+1) ?>]" id="cat_<?= ($CatKey+1) ?>" value="1"<?php if (isset($_GET['categories'][$CatKey + 1])) { ?> checked="checked"<?php } ?> />
+            <input type="checkbox"
+              name="categories[<?= ($CatKey+1) ?>]"
+              id="cat_<?= ($CatKey+1) ?>" value="1" <?php if (isset($_GET['categories'][$CatKey + 1])) { ?>
+            checked="checked"<?php } ?> />
             <label for="cat_<?= ($CatKey + 1) ?>"><?= $CatName ?></label>
           </td>
-<?php
+          <?php
 }
 ?>
         </tr>
 
       <!-- Submit -->
       <div class="submit">
-        <span class="float_left"><?= number_format($TorrentCount) ?> Results</span>
+        <span class="float_left"><?= number_format($TorrentCount) ?>
+          Results</span>
         <input type="submit" value="Search" />
       </div>
     </form>
   </div>
 
   <!-- Results table -->
-<?php if (count($GroupIDs) === 0) { ?>
+  <?php if (count($GroupIDs) === 0) { ?>
   <div class="center">
     Nothing found!
   </div>
-<?php } else { ?>
-  <div class="linkbox"><?=$Pages?></div>
+  <?php } else { ?>
+  <div class="linkbox"><?=$Pages?>
+  </div>
   <div class="box">
-  <table class="torrent_table cats" width="100%">
-    <tr class="colhead">
-      <td class="cats_col"></td>
-      <td><a href="<?= header_link('Name', 'ASC') ?>">Torrent</a></td>
-      <td><a href="<?= header_link('Time') ?>">Time</a></td>
-      <td><a href="<?= header_link('Size') ?>">Size</a></td>
-      <td class="sign snatches">
-        <a href="<?= header_link('Snatched') ?>">
-          <svg width="15" height="15" fill="black" class="tooltip" alt="Snatches" title="Snatches" viewBox="3 0 88 98"><path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path></svg>
-        </a>
-      </td>
-      <td class="sign seeders">
-        <a href="<?= header_link('Seeders') ?>">
-          <svg width="11" height="15" fill="black" class="tooltip" alt="Seeders" title="Seeders"><polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon></svg>
-        </a>
-      </td>
-      <td class="sign leechers">
-        <a href="<?= header_link('Leechers') ?>">
-          <svg width="11" height="15" fill="black" class="tooltip" alt="Leechers" title="Leechers"><polygon points="0,8 5.5,15 11,8 8,8 8,0 3,0 3,8"></polygon></svg>
-        </a>
-      </td>
-    </tr>
-
-    <!-- Results list -->
-<?php
+    <table class="torrent_table cats" width="100%">
+      <tr class="colhead">
+        <td class="cats_col"></td>
+        <td><a
+            href="<?= header_link('Name', 'ASC') ?>">Torrent</a>
+        </td>
+        <td><a
+            href="<?= header_link('Time') ?>">Time</a>
+        </td>
+        <td><a
+            href="<?= header_link('Size') ?>">Size</a>
+        </td>
+        <td class="sign snatches">
+          <a
+            href="<?= header_link('Snatched') ?>">
+            <svg width="15" height="15" fill="black" class="tooltip" alt="Snatches" title="Snatches"
+              viewBox="3 0 88 98">
+              <path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path>
+            </svg>
+          </a>
+        </td>
+        <td class="sign seeders">
+          <a
+            href="<?= header_link('Seeders') ?>">
+            <svg width="11" height="15" fill="black" class="tooltip" alt="Seeders" title="Seeders">
+              <polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon>
+            </svg>
+          </a>
+        </td>
+        <td class="sign leechers">
+          <a
+            href="<?= header_link('Leechers') ?>">
+            <svg width="11" height="15" fill="black" class="tooltip" alt="Leechers" title="Leechers">
+              <polygon points="0,8 5.5,15 11,8 8,8 8,0 3,0 3,8"></polygon>
+            </svg>
+          </a>
+        </td>
+      </tr>
+
+      <!-- Results list -->
+      <?php
   $PageSize = 0;
   foreach ($TorrentsInfo as $TorrentID => $Info) {
       list($GroupID, , $Time) = array_values($Info);
           $DisplayName .= " - $ExtraInfo";
       } ?>
 
-    <tr class="torrent torrent_row<?= ($Torrent['IsSnatched'] ? ' snatched_torrent' : '') . ($GroupFlags['IsSnatched'] ? ' snatched_group' : '') ?>">
-      <td class="center cats_col">
-        <div title="<?= Format::pretty_category($GroupCategoryID) ?>" class="tooltip <?= Format::css_category($GroupCategoryID) ?>"></div>
-      </td>
-      <td class="big_info">
-        <div class="group_info clear">
-          <span class="torrent_links_block">
-            [ <a href="torrents.php?action=download&amp;id=<?= $TorrentID ?>&amp;authkey=<?= $LoggedUser['AuthKey'] ?>&amp;torrent_pass=<?= $LoggedUser['torrent_pass'] ?>" class="tooltip" title="Download">DL</a>
-            | <a href="reportsv2.php?action=report&amp;id=<?= $TorrentID ?>" class="tooltip" title="Report">RP</a> ]
-          </span>
-          <?php echo "$DisplayName\n"; ?>
-          <div class="tags"><?= $TorrentTags->format('torrents.php?type='.$Action.'&amp;userid='.$UserID.'&amp;tags=') ?></div>
-        </div>
-      </td>
-      <td class="nobr"><?= time_diff($Time, 1) ?></td>
-      <td class="number_column nobr"><?= Format::get_size($Torrent['Size']) ?></td>
-      <td class="number_column"><?= number_format($Torrent['Snatched']) ?></td>
-      <td class="number_column<?= (($Torrent['Seeders'] === 0) ? ' r00' : '') ?>"><?= number_format($Torrent['Seeders']) ?></td>
-      <td class="number_column"><?= number_format($Torrent['Leechers']) ?></td>
-    </tr>
-<?php
+      <tr
+        class="torrent torrent_row<?= ($Torrent['IsSnatched'] ? ' snatched_torrent' : '') . ($GroupFlags['IsSnatched'] ? ' snatched_group' : '') ?>">
+        <td class="center cats_col">
+          <div
+            title="<?= Format::pretty_category($GroupCategoryID) ?>"
+            class="tooltip <?= Format::css_category($GroupCategoryID) ?>">
+          </div>
+        </td>
+        <td class="big_info">
+          <div class="group_info clear">
+            <span class="torrent_links_block">
+              [ <a
+                href="torrents.php?action=download&amp;id=<?= $TorrentID ?>&amp;authkey=<?= $LoggedUser['AuthKey'] ?>&amp;torrent_pass=<?= $LoggedUser['torrent_pass'] ?>"
+                class="tooltip" title="Download">DL</a>
+              | <a
+                href="reportsv2.php?action=report&amp;id=<?= $TorrentID ?>"
+                class="tooltip" title="Report">RP</a> ]
+            </span>
+            <?php echo "$DisplayName\n"; ?>
+            <div class="tags"><?= $TorrentTags->format('torrents.php?type='.$Action.'&amp;userid='.$UserID.'&amp;tags=') ?>
+            </div>
+          </div>
+        </td>
+        <td class="nobr"><?= time_diff($Time, 1) ?>
+        </td>
+        <td class="number_column nobr"><?= Format::get_size($Torrent['Size']) ?>
+        </td>
+        <td class="number_column"><?= number_format($Torrent['Snatched']) ?>
+        </td>
+        <td
+          class="number_column<?= (($Torrent['Seeders'] === 0) ? ' r00' : '') ?>">
+          <?= number_format($Torrent['Seeders']) ?>
+        </td>
+        <td class="number_column"><?= number_format($Torrent['Leechers']) ?>
+        </td>
+      </tr>
+      <?php
   } ?>
-  </table>
+    </table>
+  </div>
+  <?php  } ?>
+  <div class="linkbox"><?= $Pages ?>
   </div>
-<?php  } ?>
-  <div class="linkbox"><?= $Pages ?></div>
 </div>
-<?php View::show_footer(); ?>
+<?php View::show_footer();

sections/user/notify_edit.php

-<?
+<?php
 if (!check_perms('site_torrents_notify')) {
-  error(403);
+    error(403);
 }
 View::show_header('Manage notifications', 'jquery.validate,form_validate');
 ?>
 <div class="thin">
   <div class="header">
-    <h2>Notify me of all new torrents with...</h2>
+    <h2>Notify me of all new torrents with&hellip;</h2>
     <div class="linkbox">
       <a href="torrents.php?action=notify" class="brackets">View notifications</a>
     </div>
   </div>
-<?
+  <?php
 $DB->query("
   SELECT
     ID,
 
 $i = 0;
 foreach ($Notifications as $N) { // $N stands for Notifications
-  $i++;
-  $NewFilter = $N['ID'] === false;
-  $N['Artists']      = implode(', ', explode('|', substr($N['Artists'], 1, -1)));
-  $N['Tags']         = implode(', ', explode('|', substr($N['Tags'], 1, -1)));
-  $N['NotTags']      = implode(', ', explode('|', substr($N['NotTags'], 1, -1)));
-  $N['ReleaseTypes'] = explode('|', substr($N['ReleaseTypes'], 1, -1));
-  $N['Categories']   = explode('|', substr($N['Categories'], 1, -1));
-  $N['Formats']      = explode('|', substr($N['Formats'], 1, -1));
-  $N['Encodings']    = explode('|', substr($N['Encodings'], 1, -1));
-  $N['Media']        = explode('|', substr($N['Media'], 1, -1));
-  $N['Users']        = explode('|', substr($N['Users'], 1, -1));
-
-  $Usernames = '';
-  foreach ($N['Users'] as $UserID) {
-    $UserInfo = Users::user_info($UserID);
-    $Usernames .= $UserInfo['Username'] . ', ';
-  }
-  $Usernames = rtrim($Usernames, ', ');
-
-  if ($N['FromYear'] == 0) {
-    $N['FromYear'] = '';
-  }
-  if ($N['ToYear'] == 0) {
-    $N['ToYear'] = '';
-  }
-  if ($NewFilter && $NumFilters > 0) {
-?>
+    $i++;
+    $NewFilter = $N['ID'] === false;
+    $N['Artists']      = implode(', ', explode('|', substr($N['Artists'], 1, -1)));
+    $N['Tags']         = implode(', ', explode('|', substr($N['Tags'], 1, -1)));
+    $N['NotTags']      = implode(', ', explode('|', substr($N['NotTags'], 1, -1)));
+    $N['ReleaseTypes'] = explode('|', substr($N['ReleaseTypes'], 1, -1));
+    $N['Categories']   = explode('|', substr($N['Categories'], 1, -1));
+    $N['Formats']      = explode('|', substr($N['Formats'], 1, -1));
+    $N['Encodings']    = explode('|', substr($N['Encodings'], 1, -1));
+    $N['Media']        = explode('|', substr($N['Media'], 1, -1));
+    $N['Users']        = explode('|', substr($N['Users'], 1, -1));
+
+    $Usernames = '';
+    foreach ($N['Users'] as $UserID) {
+        $UserInfo = Users::user_info($UserID);
+        $Usernames .= $UserInfo['Username'] . ', ';
+    }
+    $Usernames = rtrim($Usernames, ', ');
+
+    if ($N['FromYear'] === 0) {
+        $N['FromYear'] = '';
+    }
+    if ($N['ToYear'] === 0) {
+        $N['ToYear'] = '';
+    }
+    if ($NewFilter && $NumFilters > 0) {
+        ?>
   <br><br>
   <h3>Create a new notification filter</h3>
-<?  } elseif ($NumFilters > 0) { ?>
+  <?php
+    } elseif ($NumFilters > 0) { ?>
   <h3>
-    <a href="feeds.php?feed=torrents_notify_<?=$N['ID']?>_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode($N['Label'])?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed"></a>
+    <a
+      href="feeds.php?feed=torrents_notify_<?=$N['ID']?>_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode($N['Label'])?>"><img
+        src="<?=STATIC_SERVER?>/common/symbols/rss.png"
+        alt="RSS feed"></a>
     <?=display_str($N['Label'])?>
-    <a href="user.php?action=notify_delete&amp;id=<?=$N['ID']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this notification filter?')" class="brackets">Delete</a>
-    <a data-toggle-target="#filter_<?=$N['ID']?>" class="brackets">Show</a>
+    <a href="user.php?action=notify_delete&amp;id=<?=$N['ID']?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
+      onclick="return confirm('Are you sure you want to delete this notification filter?')" class="brackets">Delete</a>
+    <a data-toggle-target="#filter_<?=$N['ID']?>"
+      class="brackets">Show</a>
   </h3>
-<?  } ?>
-  <form class="box pad slight_margin <?=($NewFilter ? 'create_form' : 'edit_form')?>" id="<?=($NewFilter ? 'filter_form' : '')?>" name="notification" action="user.php" method="post">
+  <?php  } ?>
+  <form
+    class="box pad slight_margin <?=($NewFilter ? 'create_form' : 'edit_form')?>"
+    id="<?=($NewFilter ? 'filter_form' : '')?>"
+    name="notification" action="user.php" method="post">
     <input type="hidden" name="formid" value="<?=$i?>">
     <input type="hidden" name="action" value="notify_handle">
-    <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>">
-<?  if (!$NewFilter) { ?>
-    <input type="hidden" name="id<?=$i?>" value="<?=$N['ID']?>">
-<?  } ?>
+    <input type="hidden" name="auth"
+      value="<?=$LoggedUser['AuthKey']?>">
+    <?php  if (!$NewFilter) { ?>
+    <input type="hidden" name="id<?=$i?>"
+      value="<?=$N['ID']?>">
+    <?php  } ?>
     <table <?=(!$NewFilter ? 'id="filter_'.$N['ID'].'" class="layout hidden"' : 'class="layout"')?>>
-<?  if ($NewFilter) { ?>
+      <?php  if ($NewFilter) { ?>
+
       <tr>
-        <td class="label"><strong>Notification filter name</strong></td>
+        <td class="label">
+          <strong>Notification filter name</strong>
+          <strong class="important_text">*</strong>
+        </td>
         <td>
-          <input type="text" class="required" name="label<?=$i?>" style="width: 100%;">
-          <p class="min_padding">A name for the notification filter set to tell different filters apart.</p>
+          <input type="text" class="required" name="label<?=$i?>"
+            style="width: 100%;">
+          <p class="min_padding">A name for the notification filter set to tell different filters apart</p>
         </td>
       </tr>
+
+      <!--
       <tr>
         <td colspan="2" class="center">
           <strong>All fields below here are optional</strong>
         </td>
       </tr>
-<?  } ?>
+      -->
+
+      <?php  } ?>
+
       <tr>
         <td class="label"><strong>One of these artists</strong></td>
         <td>
-          <textarea name="artists<?=$i?>" style="width: 100%;" rows="5"><?=display_str($N['Artists'])?></textarea>
-          <p class="min_padding">Comma-separated list&#8202;&mdash;&#8202;e.g. <em>Yumeno Aika, Pink Pineapple, Sayama Ai</em></p>
-          <input type="checkbox" name="excludeva<?=$i?>" id="excludeva_<?=$N['ID']?>"<? if ($N['ExcludeVA'] == '1') { echo ' checked="checked"';} ?>>
-          <label for="excludeva_<?=$N['ID']?>">Exclude Various Artists releases</label>
+          <textarea name="artists<?=$i?>" style="width: 100%;"
+            rows="5"><?=display_str($N['Artists'])?></textarea>
+          <p class="min_padding">Comma-separated list, e.g., Yumeno Aika, Pink Pineapple</p>
+          <!--
+          <input type="checkbox" name="excludeva<?=$i?>"
+          id="excludeva_<?=$N['ID']?>" <?php if ($N['ExcludeVA'] === '1') {
+        echo ' checked="checked"';
+    } ?>>
+          <label
+            for="excludeva_<?=$N['ID']?>">Exclude
+            Various Artists releases</label>
+          -->
         </td>
       </tr>
+
       <tr>
         <td class="label"><strong>One of these users</strong></td>
         <td>
-          <textarea name="users<?=$i?>" style="width: 100%;" rows="5"><?=display_str($Usernames)?></textarea>
+          <textarea name="users<?=$i?>" style="width: 100%;"
+            rows="5"><?=display_str($Usernames)?></textarea>
           <p class="min_padding">Comma-separated list of usernames</p>
         </td>
       </tr>
+
       <tr>
         <td class="label"><strong>At least one of these tags</strong></td>
         <td>
-          <textarea name="tags<?=$i?>" style="width: 100%;" rows="2"><?=display_str($N['Tags'])?></textarea>
-          <p class="min_padding">Comma-separated list&#8202;&mdash;&#8202;e.g. <em>big.breasts, paizuri, nakadashi</em></p>
+          <textarea name="tags<?=$i?>" style="width: 100%;"
+            rows="2"><?=display_str($N['Tags'])?></textarea>
+          <p class="min_padding">Comma-separated list, e.g., paizuri, nakadashi
+          </p>
         </td>
       </tr>
+
       <tr>
         <td class="label"><strong>None of these tags</strong></td>
         <td>
-          <textarea name="nottags<?=$i?>" style="width: 100%;" rows="2"><?=display_str($N['NotTags'])?></textarea>
-          <p class="min_padding">Comma-separated list&#8202;&mdash;&#8202;e.g. <em>big.breasts, paizuri, nakadashi</em></p>
+          <textarea name="nottags<?=$i?>" style="width: 100%;"
+            rows="2"><?=display_str($N['NotTags'])?></textarea>
+          <p class="min_padding">Comma-separated list, e.g., paizuri, nakadashi
+          </p>
         </td>
       </tr>
+
       <tr>
         <td class="label"><strong>Only these categories</strong></td>
         <td>
-<?  foreach ($Categories as $Category) { ?>
-          <input type="checkbox" name="categories<?=$i?>[]" id="<?=$Category?>_<?=$N['ID']?>" value="<?=$Category?>"<? if (in_array($Category, $N['Categories'])) { echo ' checked="checked"';} ?>>
-          <label for="<?=$Category?>_<?=$N['ID']?>"><?=$Category?></label>
-<?  } ?>
+          <?php  foreach ($Categories as $Category) { ?>
+          <input type="checkbox" name="categories<?=$i?>[]"
+            id="<?=$Category?>_<?=$N['ID']?>"
+            value="<?=$Category?>" <?php if (in_array($Category, $N['Categories'])) {
+        echo ' checked="checked"';
+    } ?>>
+          <label
+            for="<?=$Category?>_<?=$N['ID']?>"><?=$Category?></label><br />
+          <?php  } ?>
+        </td>
+      </tr>
+
+      <tr>
+        <td class="label"><strong>Only these media</strong></td>
+        <td>
+          <?php  foreach ($Media as $Medium) { ?>
+          <input type="checkbox" name="media<?=$i?>[]"
+            id="<?=$Medium?>_<?=$N['ID']?>"
+            value="<?=$Medium?>" <?php if (in_array($Medium, $N['Media'])) {
+        echo ' checked="checked"';
+    } ?>>
+          <label
+            for="<?=$Medium?>_<?=$N['ID']?>"><?=$Medium?></label><br />
+          <?php  } ?>
         </td>
       </tr>
+
       <tr>
         <td class="label"><strong>Only these media</strong></td>
         <td>
-<?  foreach ($Media as $Medium) { ?>
-          <input type="checkbox" name="media<?=$i?>[]" id="<?=$Medium?>_<?=$N['ID']?>" value="<?=$Medium?>"<? if (in_array($Medium, $N['Media'])) { echo ' checked="checked"';} ?>>
-          <label for="<?=$Medium?>_<?=$N['ID']?>"><?=$Medium?></label>
-<?  } ?>
+          <?php  foreach ($MediaManga as $Medium) { ?>
+          <input type="checkbox" name="media<?=$i?>[]"
+            id="<?=$Medium?>_<?=$N['ID']?>"
+            value="<?=$Medium?>" <?php if (in_array($Medium, $N['Media'])) {
+        echo ' checked="checked"';
+    } ?>>
+          <label
+            for="<?=$Medium?>_<?=$N['ID']?>"><?=$Medium?></label><br />
+          <?php  } ?>
         </td>
       </tr>
+
       <tr>
         <td class="label"><strong>Only new releases</strong></td>
         <td>
-          <input type="checkbox" name="newgroupsonly<?=$i?>" id="newgroupsonly_<?=$N['ID']?>"<? if ($N['NewGroupsOnly'] == '1') { echo ' checked="checked"';} ?>>
-<label for="newgroupsonly_<?=$N['ID']?>">Only notify for new releases, not new formats</label>
+          <input type="checkbox" name="newgroupsonly<?=$i?>"
+            id="newgroupsonly_<?=$N['ID']?>"
+            <?php if ($N['NewGroupsOnly'] == '1') { # todo: Fix strict equality checking
+        echo ' checked="checked"';
+    } ?>>
+          <label
+            for="newgroupsonly_<?=$N['ID']?>">Only
+            notify for new releases, not new formats</label>
         </td>
       </tr>
+
       <tr>
         <td colspan="2" class="center">
-          <input type="submit" value="<?=($NewFilter ? 'Create filter' : 'Update filter')?>">
+          <input type="submit"
+            value="<?=($NewFilter ? 'Create' : 'Update')?>">
         </td>
       </tr>
     </table>
   </form>
-<? } ?>
+  <?php
+} ?>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer();