diff --git a/website/themes/beastie/layouts/_partials/sidenav.html b/website/themes/beastie/layouts/_partials/sidenav.html
index 8c8a627cbd..b32e28b5b2 100644
--- a/website/themes/beastie/layouts/_partials/sidenav.html
+++ b/website/themes/beastie/layouts/_partials/sidenav.html
@@ -1,129 +1,131 @@
 {{ $currentLang := .language }}
 {{ if eq .sidenavType "about" }}
 <ul>
   <li><a href={{ "about/" | relLangURL }}>{{ i18n "about" }}</a></li>
   <li><a href={{ "features/" | relLangURL }}>{{ i18n "features" }}</a></li>
   <li><a href={{ "applications/" | relLangURL }}>{{ i18n "applications" }}</a></li>
   <li><a href={{ "administration/" | relLangURL }}>{{ i18n "administration" }}</a></li>
   <li><a href={{ "news/" | relLangURL }}>{{ i18n "news" }}</a></li>
   <li><a href={{ "events" | relLangURL }}>{{ i18n "events" }}</a></li>
   <li><a href={{ "press" | relLangURL }}>{{ i18n "pressSidenav" }}</a></li>
   <li><a href={{ "art" | relLangURL }}>{{ i18n "art" }}</a></li>
   <li><a href={{ "donations" | relLangURL }}>{{ i18n "donations" }}</a></li>
   <li><a href={{ "copyright" | relLangURL }}>{{ i18n "legalNotices" }}</a></li>
   <li><a href={{ "privacy" | relLangURL }}>{{ i18n "privacy" }}</a></li>
 </ul>
 {{ else if eq .sidenavType "community" }}
 <ul>
   <li><a href="https://www.bsdnow.tv/" target="_blank">BSD Now</a></li>
   <li><a href="https://discord.com/invite/freebsd" target="_blank">Discord</a></li>
   <li><a href={{ "events" | relLangURL }}>{{ i18n "events" }}</a></li>
   <li><a href="https://forums.FreeBSD.org/" target="_blank">{{ i18n "forums" }}</a></li>
   <li><a href="{{ "community/irc/" | relLangURL }}">IRC</a></li>
   <li><a href="{{ "community/mailinglists/" | relLangURL }}">{{ i18n "mailinglists" }}</a></li>
   <li><a href="https://www.reddit.com/r/freebsd/" target="_blank">Reddit</a></li>
   <li><a href="{{ "usergroups" | relLangURL }}">{{ i18n "usergroups" }}</a></li>
   <li><a href="https://www.youtube.com/FreeBSDProject" target="_blank">YouTube</a></li>
 </ul>
 {{ else if eq .sidenavType "developers" }}
 <ul>
   <li><a href={{ "projects" | relLangURL }}>{{ i18n "Developers" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/developers-handbook/" }}>{{ i18n "developerHandbook" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/articles/committers-guide" }}>{{ i18n "committersGuide" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/porters-handbook/" }}>{{ i18n "porterHandbook" }}</a></li>
   <li><a href={{ "releng" | relLangURL }}>{{ i18n "releng" }}</a></li>
   <li><a href={{ "platforms" | relLangURL }}>{{ i18n "platforms" }}</a></li>
   <li><a href="https://wiki.FreeBSD.org/IdeasPage">{{ i18n "ideas" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/articles/contributing/" }}>{{ i18n "contributing" }}</a></li>
 </ul>
 {{ else if eq .sidenavType "docs" }}
 <ul>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/" }}>{{ i18n "documentation" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/faq/" }}>{{ i18n "FAQ" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/handbook/" }}>{{ i18n "handbook" }}</a></li>
   <li><a href="https://man.FreeBSD.org">{{ i18n "man" }}</a></li>
   <li><a href="https://papers.freebsd.org/">{{ i18n "papers" }}</a></li>
   <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/" }}>{{ i18n "booksArticles" }}</a></li>
   <li><a href={{ "docs/webresources/" | relLangURL }}>{{ i18n "webresources" }}</a></li>
   <li><a href={{ "projects/newbies/" | relLangURL }}>{{ i18n "newbies" }}</a></li>
   <li><a href={{ "docproj" | relLangURL }}>{{ i18n "docproj" }}</a></li>
   <li><a href="https://docs.freebsd.org/doc/">{{ i18n "archive" }}</a></li>
 </ul>
 {{ else if eq .sidenavType "download" }}
 <ul>
   <li><a href={{ "where" | relLangURL }}>{{ i18n "getFreeBSD" }}</a></li>
   <li>
     <a href={{ "releases" | relLangURL }}>{{ i18n "releases" }}</a>
     <ul>
       <li>{{ i18n "productionRelease" }}: <a href={{ index .data.releases "u-rel151-announce" }}>{{ index .data.releases "rel151-current" }}</a></li>
       <li>{{ i18n "legacyRelease" }}: <a href={{ index .data.releases "u-rel150-announce" }}>{{ index .data.releases "rel150-current" }}</a></li>
       <li>{{ i18n "legacyRelease" }}: <a href={{ index .data.releases "u-rel145-announce" }}>{{ index .data.releases "rel145-current" }}</a></li>
       <li>{{ i18n "legacyRelease" }}: <a href={{ index .data.releases "u-rel144-announce" }}>{{ index .data.releases "rel144-current" }}</a></li>
     </ul>
   </li>
   <li>
     <a href={{ "snapshots" | relLangURL }}>{{ i18n "snapshotReleases" }}</a>
       <ul>
         {{ $betaUpcoming := index .data.releases "beta-upcoming" }}
         {{ if ne $betaUpcoming "IGNORE" }}
         <li>{{ i18n "upcomingRelease" }}: <a href={{ index .data.releases "u-betarel-schedule" }}>{{ index .data.releases "betarel-current" }}</a></li>
         {{ end }}
         {{ $beta2Upcoming := index .data.releases "beta2-upcoming" }}
         {{ if ne $beta2Upcoming "IGNORE" }}
         <li>{{ i18n "upcomingRelease" }}: <a href={{ index .data.releases "u-betarel2-schedule" }}>{{ index .data.releases "betarel2-current" }}</a></li>
         {{ end }}
         {{ $beta3Upcoming := index .data.releases "beta3-upcoming" }}
         {{ if ne $beta3Upcoming "IGNORE" }}
         <li>{{ i18n "upcomingRelease" }}: <a href={{ index .data.releases "u-betarel3-schedule" }}>{{ index .data.releases "betarel3-current" }}</a></li>
         {{ end }}
       </ul>
   </li>
 </ul>
 {{ else if eq .sidenavType "ports" }}
 <ul>
   <li><a href="https://ports.freebsd.org/cgi/ports.cgi">Ports</a></li>
   <li><a href="https://www.freshports.org/" target="_blank">FreshPorts</a></li>
 </ul>
 {{ else if eq .sidenavType "support" }}
 <ul>
   <li><a href={{ "support" | relLangURL }}>{{ i18n "support" }}</a></li>
   <li>
     <a href={{ "commercial" | relLangURL }}>{{ i18n "vendors" }}</a>
     <ul>
       <li><a href={{ "commercial/software_bycat/" | relLangURL }}>{{ i18n "software" }}</a></li>
       <li><a href={{ "commercial/hardware/" | relLangURL }}>{{ i18n "hardware" }}</a></li>
       <li><a href={{ "commercial/consult_bycat/" | relLangURL }}>{{ i18n "consulting" }}</a></li>
       <li><a href={{ "commercial/isp/" | relLangURL }}>{{ i18n "ispCommercial" }}</a></li>
     </ul>
   </li>
   <li>
     <a href={{ "security" | relLangURL }}>{{ i18n "securityInfo" }}</a>
     <ul>
       <li><a href={{ "security/advisories/" | relLangURL }}>{{ i18n "advisories" }}</a></li>
       <li><a href={{ "security/notices/" | relLangURL }}>{{ i18n "errataNoticesSidenav" }}</a></li>
       <li><a href={{ "security/#sup" | relLangURL }}>{{ i18n "supportedReleases" }}</a></li>
       <li><a href={{ "security/unsupported/" | relLangURL }}>{{ i18n "unsupportedReleases" }}</a></li>
       <li><a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/handbook/security/#security-advisories" }}>{{ i18n "readSecurityAdvisories" }}</a></li>
       <li><a href={{ "security/charter/" | relLangURL }}>{{ i18n "charterSecurityOfficerTeam" }}</a></li>
     </ul>
   </li>
   <li>
-    <li><a href="https://bugs.FreeBSD.org/submit/">{{ i18n "submitPR" }}</a></li>
+    <ul>
+      <li><a href="https://bugs.FreeBSD.org/submit/">{{ i18n "submitPR" }}</a></li>
+    </ul>
   </li>
   <li><a href={{ "support/webresources/" | relLangURL }}>{{ i18n "webresources" }}</a></li>
 </ul>
 {{ else }}
 <ul>
   <li><a href={{ "about/" | relLangURL }}>{{ i18n "about" }}</a></li>
   <li><a href={{ "features/" | relLangURL }}>{{ i18n "features" }}</a></li>
   <li><a href={{ "applications/" | relLangURL }}>{{ i18n "applications" }}</a></li>
   <li><a href={{ "administration/" | relLangURL }}>{{ i18n "administration" }}</a></li>
   <li><a href={{ "news/newsflash/" | relLangURL }}>{{ i18n "news" }}</a></li>
   <li><a href={{ "events" | relLangURL }}>{{ i18n "events" }}</a></li>
   <li><a href={{ "press" | relLangURL }}>{{ i18n "pressSidenav" }}</a></li>
   <li><a href={{ "art" | relLangURL }}>{{ i18n "art" }}</a></li>
   <li><a href={{ "donations" | relLangURL }}>{{ i18n "donations" }}</a></li>
   <li><a href={{ "copyright" | relLangURL }}>{{ i18n "legalNotices" }}</a></li>
   <li><a href={{ "privacy" | relLangURL }}>{{ i18n "privacy" }}</a></li>
 </ul>
 {{ end }}