diff --git a/app/(resources)/resources/page.tsx b/app/(resources)/resources/page.tsx
index 75ca01f..27b37d9 100644
--- a/app/(resources)/resources/page.tsx
+++ b/app/(resources)/resources/page.tsx
@@ -8,6 +8,7 @@ import {
   CubeIcon,
   KeyIcon,
   GridIcon,
+  PlayIcon,
 } from '@/components/resources/icons'
 import { AtlasLogo } from '@/components/resources/atlas-logo'
 
@@ -55,7 +56,7 @@ export default function ResourcesLandingPage() {
           <section>
             <div className="resources-section-header">
               <span className="resources-section-label">Projects</span>
-              <span className="resources-section-count">06 tools</span>
+              <span className="resources-section-count">07 tools</span>
             </div>
 
             <div className="resources-projects">
@@ -115,6 +116,16 @@ export default function ResourcesLandingPage() {
                 featured
                 visual={<KeyIcon />}
               />
+
+              <ProjectCard
+                href="https://hack.build/hacking-your-hackerspace.html"
+                external
+                num="07"
+                title="Hacking Your Hackerspace"
+                description="A talk on the patterns, pitfalls, and governance lessons behind keeping a hackerspace alive — the research from these projects, condensed into one interactive session."
+                type="Talk · Interactive"
+                visual={<PlayIcon />}
+              />
             </div>
           </section>
 
diff --git a/app/login/page.tsx b/app/login/page.tsx
index c6f7b2f..158983e 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -176,6 +176,11 @@ export default function LoginPage() {
               create or join a space →
             </Link>
           </p>
+          <p className="text-center font-mono text-xs mt-4">
+            <Link href="/" className="text-zinc-500 hover:text-[#d4f53c] hover:underline transition">
+              ← Back to homepage
+            </Link>
+          </p>
         </div>
       </div>
     </div>
diff --git a/components/app-sidebar.tsx b/components/app-sidebar.tsx
index ddb9b89..0b9f9fc 100644
--- a/components/app-sidebar.tsx
+++ b/components/app-sidebar.tsx
@@ -15,7 +15,7 @@ import {
   MessageSquare, Users, CreditCard, BookUser, Download, LogOut,
   Vote, ShieldAlert, ScrollText, LineChart, UserSearch,
   MessagesSquare, SlidersHorizontal, ClipboardList, FileText, Award, BadgeCheck, GraduationCap, Hammer,
-  ChevronDown, DoorClosed, CalendarCheck, Zap,
+  ChevronDown, DoorClosed, CalendarCheck, Zap, Home, Compass,
 } from 'lucide-react'
 
 interface NavLinkProps {
@@ -24,22 +24,19 @@ interface NavLinkProps {
   icon: React.ElementType
   badge?: number
   active: boolean
+  external?: boolean
   onClick?: () => void
 }
 
-function NavLink({ href, label, icon: Icon, badge, active, onClick }: NavLinkProps) {
-  return (
-    <Link
-      href={href}
-      onClick={onClick}
-      aria-current={active ? 'page' : undefined}
-      className={cn(
-        'flex items-center justify-between mx-2 px-3 py-2 rounded-md text-sm transition-colors',
-        active
-          ? 'bg-[var(--sidebar-primary)]/15 text-[var(--sidebar-primary)]'
-          : 'text-[var(--sidebar-foreground)]/70 hover:bg-[var(--sidebar-accent)] hover:text-[var(--sidebar-foreground)]',
-      )}
-    >
+function NavLink({ href, label, icon: Icon, badge, active, external, onClick }: NavLinkProps) {
+  const className = cn(
+    'flex items-center justify-between mx-2 px-3 py-2 rounded-md text-sm transition-colors',
+    active
+      ? 'bg-[var(--sidebar-primary)]/15 text-[var(--sidebar-primary)]'
+      : 'text-[var(--sidebar-foreground)]/70 hover:bg-[var(--sidebar-accent)] hover:text-[var(--sidebar-foreground)]',
+  )
+  const inner = (
+    <>
       <span className="flex items-center gap-2.5">
         <Icon className={cn('w-4 h-4', active ? 'text-[var(--sidebar-primary)]' : 'text-[var(--sidebar-foreground)]/50')} />
         {label}
@@ -49,6 +46,18 @@ function NavLink({ href, label, icon: Icon, badge, active, onClick }: NavLinkPro
           {badge}
         </span>
       ) : null}
+    </>
+  )
+  if (external) {
+    return (
+      <a href={href} target="_blank" rel="noopener noreferrer" onClick={onClick} className={className}>
+        {inner}
+      </a>
+    )
+  }
+  return (
+    <Link href={href} onClick={onClick} aria-current={active ? 'page' : undefined} className={className}>
+      {inner}
     </Link>
   )
 }
@@ -222,6 +231,11 @@ export function AppSidebar({ member, roleName, taskBadge = 0, commsBadge = 0, pa
           <NavLink href="/me" label="My membership" icon={BadgeCheck} active={isActive('/me')} onClick={onNav} />
         </NavSection>
 
+        <NavSection id="public" title="Public Site">
+          <NavLink href="/" label="Homepage" icon={Home} external active={false} onClick={onNav} />
+          <NavLink href="/resources" label="Resources" icon={Compass} external active={false} onClick={onNav} />
+        </NavSection>
+
         {showAdminSection && (
           <NavSection id="admin" title="Admin">
             {isAdmin && <NavLink href="/customize" label="Customize" icon={SlidersHorizontal} active={isActive('/customize')} onClick={onNav} />}
diff --git a/components/resources/icons.tsx b/components/resources/icons.tsx
index ea2caee..27aae9c 100644
--- a/components/resources/icons.tsx
+++ b/components/resources/icons.tsx
@@ -114,3 +114,12 @@ export function PromptIcon(props: IconProps) {
     </svg>
   )
 }
+
+export function PlayIcon(props: IconProps) {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none" {...props}>
+      <rect x="4" y="8" width="40" height="32" rx="3" stroke="currentColor" strokeWidth={2.5} />
+      <path d="M20 18 L30 24 L20 30 Z" fill="#d4ff00" />
+    </svg>
+  )
+}