diff --git a/assets/css/main.scss b/assets/css/main.scss
index 2e0883a..dc6ad7d 100644
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@@ -10,15 +10,6 @@ $container-max-widths: (
 
 @import "bootstrap/scss/bootstrap.scss";
 
-// Navbar
-
-.navbar-site-visit {
-    display: inline-block;
-    line-height: 2em;
-    margin-bottom: 4px;
-    margin-right: 10px;
-}
-
 // Post list
 
 .postlist .post img {
diff --git a/assets/js/main.js b/assets/js/main.js
index fcbe286..28451fb 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -1,4 +1,3 @@
-import feather from "feather-icons/dist/feather.js";
 import { Application } from "@hotwired/stimulus";
 
 import ToastController from "./controllers/toast";
@@ -18,6 +17,4 @@ Stimulus.register("logout", LogoutController);
 Stimulus.register("first-run", FirstRunController);
 Stimulus.register("upload", UploadController);
 Stimulus.register("show-upload", ShowUploadController);
-Stimulus.register("pagelist", PagelistController);
-
-feather.replace();
\ No newline at end of file
+Stimulus.register("pagelist", PagelistController);
\ No newline at end of file
diff --git a/cmds/server.go b/cmds/server.go
index 36e5923..89310bd 100644
--- a/cmds/server.go
+++ b/cmds/server.go
@@ -119,17 +119,7 @@ Starting weiro without any arguments will start the server.
 			app.Post("/login", lh.DoLogin)
 			app.Post("/logout", lh.Logout)
 
-			app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index)
-			app.Get("/first-run", ih.FirstRun)
-			app.Post("/first-run", ih.FirstRunSubmit)
-
-			app.Get("/static/*", static.New("./static"))
-
-			app.Use(middleware.LogErrors(), middleware.RequireUser(svcs.Auth))
-
-			app.Get("/sites/new", ssh.New)
-			app.Post("/sites", ssh.Create)
-			siteGroup := app.Group("/sites/:siteID", middleware.RequiresSite(svcs.Sites))
+			siteGroup := app.Group("/sites/:siteID", middleware.LogErrors(), middleware.RequireUser(svcs.Auth), middleware.RequiresSite(svcs.Sites))
 
 			siteGroup.Get("/posts", ph.Index)
 			siteGroup.Get("/posts/new", ph.New)
@@ -168,6 +158,12 @@ Starting weiro without any arguments will start the server.
 			siteGroup.Post("/pages/:pageID", pgh.Update)
 			siteGroup.Post("/pages/:pageID/delete", pgh.Delete)
 
+			app.Get("/", middleware.OptionalUser(svcs.Auth), ih.Index)
+			app.Get("/first-run", ih.FirstRun)
+			app.Post("/first-run", ih.FirstRunSubmit)
+
+			app.Get("/static/*", static.New("./static"))
+
 			if err := app.Listen(":3000"); err != nil {
 				log.Println(err)
 			}
diff --git a/handlers/middleware/errlog.go b/handlers/middleware/errlog.go
index 2acac04..5b6dfa6 100644
--- a/handlers/middleware/errlog.go
+++ b/handlers/middleware/errlog.go
@@ -9,7 +9,7 @@ import (
 func LogErrors() func(c fiber.Ctx) error {
 	return func(c fiber.Ctx) error {
 		if err := c.Next(); err != nil {
-			log.Printf("%v: error: %v\n", c.Path(), err)
+			log.Printf("error: %v\n", err)
 			return err
 		}
 		return nil
diff --git a/handlers/middleware/site.go b/handlers/middleware/site.go
index 6f47430..54211bc 100644
--- a/handlers/middleware/site.go
+++ b/handlers/middleware/site.go
@@ -32,19 +32,9 @@ func RequiresSite(sites *sites.Service) func(c fiber.Ctx) error {
 				return err
 			}
 		}
+
 		c.Locals("site", site)
 		c.SetContext(models.WithSite(c.Context(), site))
-
-		sitesOwnedByUser, err := sites.ListSites(c.Context())
-		if err != nil {
-			return err
-		}
-		c.Locals("allSites", sitesOwnedByUser)
-
-		if pubTargets, err := sites.BestPubTarget(c.Context(), site); err == nil {
-			c.Locals("pubTarget", pubTargets)
-		}
-
 		return c.Next()
 	}
 }
diff --git a/handlers/sitesettings.go b/handlers/sitesettings.go
index e61ced4..0fe2100 100644
--- a/handlers/sitesettings.go
+++ b/handlers/sitesettings.go
@@ -12,28 +12,10 @@ type SiteSettingsHandler struct {
 	SiteService *sites.Service
 }
 
-func (s *SiteSettingsHandler) New(c fiber.Ctx) error {
-	return c.Render("sitesettings/new", fiber.Map{}, "layouts/bare_with_scripts")
-}
+func (s *SiteSettingsHandler) General(ctx fiber.Ctx) error {
+	site := ctx.Locals("site").(models.Site)
 
-func (s *SiteSettingsHandler) Create(c fiber.Ctx) error {
-	var params sites.CreateSiteParams
-	if err := c.Bind().Body(&params); err != nil {
-		return err
-	}
-
-	newSite, err := s.SiteService.CreateSite(c.Context(), params)
-	if err != nil {
-		return err
-	}
-
-	return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", newSite.ID))
-}
-
-func (s *SiteSettingsHandler) General(c fiber.Ctx) error {
-	site := c.Locals("site").(models.Site)
-
-	return c.Render("sitesettings/general", fiber.Map{
+	return ctx.Render("sitesettings/general", fiber.Map{
 		"site":   site,
 		"tzones": sites.ListZones(),
 	})
diff --git a/layouts/simplecss/templates/layout_main.html b/layouts/simplecss/templates/layout_main.html
index d3d27bd..4aa5199 100644
--- a/layouts/simplecss/templates/layout_main.html
+++ b/layouts/simplecss/templates/layout_main.html
@@ -13,13 +13,6 @@
 <header>
   <h1>{{ .Site.Title }}</h1>
   <p>{{ .Site.Tagline }}</p>
-  {{ if .Site.NavItems }}
-    <nav>
-    {{ range .Site.NavItems }}
-      {{ if .ShowInNav }}<a href="{{ url_abs .Slug }}">{{ .Title }}</a>{{ end }}
-    {{ end }}
-    </nav>
-  {{ end }}
 </header>
 
 <main>
diff --git a/models/pubmodel/sites.go b/models/pubmodel/sites.go
index 9f25b2f..38ba614 100644
--- a/models/pubmodel/sites.go
+++ b/models/pubmodel/sites.go
@@ -6,7 +6,6 @@ import (
 	"iter"
 
 	"lmika.dev/lmika/weiro/models"
-	"lmika.dev/pkg/modash/moslice"
 )
 
 type Site struct {
@@ -21,7 +20,3 @@ type Site struct {
 	CategoriesOfPost   func(ctx context.Context, postID int64) ([]*models.Category, error)
 	Pages              []*models.Page
 }
-
-func (s Site) NavItems() []*models.Page {
-	return moslice.Filter(s.Pages, func(p *models.Page) bool { return p.ShowInNav })
-}
diff --git a/package-lock.json b/package-lock.json
index 2068fd3..c4f391c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,8 +7,7 @@
       "dependencies": {
         "@hotwired/stimulus": "^3.2.2",
         "bootstrap": "^5.3.8",
-        "esbuild-sass-plugin": "^3.6.0",
-        "feather-icons": "^4.29.2"
+        "esbuild-sass-plugin": "^3.6.0"
       },
       "devDependencies": {
         "esbuild": "0.27.3"
@@ -784,12 +783,6 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/classnames": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
-      "license": "MIT"
-    },
     "node_modules/colorjs.io": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
@@ -797,17 +790,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/core-js": {
-      "version": "3.49.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz",
-      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
@@ -873,16 +855,6 @@
         "sass-embedded": "^1.97.2"
       }
     },
-    "node_modules/feather-icons": {
-      "version": "4.29.2",
-      "resolved": "https://registry.npmjs.org/feather-icons/-/feather-icons-4.29.2.tgz",
-      "integrity": "sha512-0TaCFTnBTVCz6U+baY2UJNKne5ifGh7sMG4ZC2LoBWCZdIyPa+y6UiR4lEYGws1JOFWdee8KAsAIvu0VcXqiqA==",
-      "license": "MIT",
-      "dependencies": {
-        "classnames": "^2.2.5",
-        "core-js": "^3.1.3"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -915,9 +887,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
-      "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
+      "integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==",
       "license": "MIT"
     },
     "node_modules/is-core-module": {
diff --git a/package.json b/package.json
index 5a786ac..64e6fca 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,6 @@
   "dependencies": {
     "@hotwired/stimulus": "^3.2.2",
     "bootstrap": "^5.3.8",
-    "esbuild-sass-plugin": "^3.6.0",
-    "feather-icons": "^4.29.2"
+    "esbuild-sass-plugin": "^3.6.0"
   }
 }
diff --git a/services/sites/services.go b/services/sites/services.go
index 4585d03..86e34b2 100644
--- a/services/sites/services.go
+++ b/services/sites/services.go
@@ -9,7 +9,6 @@ import (
 	"github.com/gofiber/fiber/v3"
 	"lmika.dev/lmika/weiro/models"
 	"lmika.dev/lmika/weiro/providers/db"
-	"lmika.dev/pkg/modash/moslice"
 )
 
 type Service struct {
@@ -26,22 +25,6 @@ func (s *Service) HasUsersAsSites(ctx context.Context) (bool, error) {
 	return s.db.HasUsersAndSites(ctx)
 }
 
-func (s *Service) ListSites(ctx context.Context) ([]models.Site, error) {
-	user, ok := models.GetUser(ctx)
-	if !ok {
-		return nil, models.UserRequiredError
-	}
-
-	sites, err := s.db.SelectSitesOwnedByUser(ctx, user.ID)
-	if err != nil {
-		return nil, err
-	} else if len(sites) == 0 {
-		return nil, errors.New("no sites found")
-	}
-
-	return sites, nil
-}
-
 func (s *Service) BestSite(ctx context.Context, user models.User) (models.Site, error) {
 	sites, err := s.db.SelectSitesOwnedByUser(ctx, user.ID)
 	if err != nil {
@@ -53,20 +36,16 @@ func (s *Service) BestSite(ctx context.Context, user models.User) (models.Site,
 	return sites[0], nil
 }
 
-type CreateSiteParams struct {
+type FirstRunRequest struct {
+	Username      string `form:"username"`
+	Password1     string `form:"password1"`
+	Password2     string `form:"password2"`
 	SiteName      string `form:"siteName"`
 	SiteURL       string `form:"siteUrl"`
 	NetlifySiteID string `form:"netlifySiteId"`
 	NetlifyAPIKey string `form:"netlifyAPIToken"`
 }
 
-type FirstRunRequest struct {
-	CreateSiteParams
-	Username  string `form:"username"`
-	Password1 string `form:"password1"`
-	Password2 string `form:"password2"`
-}
-
 func (frr FirstRunRequest) Validate() error {
 	return validation.ValidateStruct(&frr,
 		validation.Field(&frr.Username, validation.Required, validation.Match(models.ValidUserName)),
@@ -97,31 +76,16 @@ func (s *Service) FirstRun(ctx context.Context, req FirstRunRequest) (newUser mo
 		return newUser, newSite, err
 	}
 
-	ctx = models.WithUser(ctx, newUser)
-	newSite, err = s.CreateSite(ctx, req.CreateSiteParams)
-	if err != nil {
-		return newUser, newSite, err
-	}
-
-	return newUser, newSite, nil
-}
-
-func (s *Service) CreateSite(ctx context.Context, req CreateSiteParams) (newSite models.Site, _ error) {
-	user, ok := models.GetUser(ctx)
-	if !ok {
-		return newSite, models.UserRequiredError
-	}
-
 	newSite = models.Site{
 		Title:        defaultIfEmpty(req.SiteName, "New Site"),
 		GUID:         models.NewNanoID(),
-		OwnerID:      user.ID,
+		OwnerID:      newUser.ID,
 		Timezone:     "UTC",
 		PostsPerPage: 10,
 		Created:      time.Now(),
 	}
 	if err := s.db.SaveSite(ctx, &newSite); err != nil {
-		return newSite, err
+		return newUser, newSite, err
 	}
 
 	hasNetlifyConfig := req.SiteURL != "" && req.NetlifySiteID != "" && req.NetlifyAPIKey != ""
@@ -136,11 +100,11 @@ func (s *Service) CreateSite(ctx context.Context, req CreateSiteParams) (newSite
 			TargetKey:  req.NetlifyAPIKey,
 		}
 		if err := s.db.SavePublishTarget(ctx, &target); err != nil {
-			return newSite, err
+			return newUser, newSite, err
 		}
 	}
 
-	return newSite, nil
+	return newUser, newSite, nil
 }
 
 func (s *Service) GetSiteByID(ctx context.Context, siteID int64) (models.Site, error) {
@@ -202,17 +166,3 @@ func (s *Service) UpdateSiteSettings(ctx context.Context, params UpdateSiteSetti
 
 	return site, nil
 }
-
-func (s *Service) BestPubTarget(ctx context.Context, site models.Site) (models.SitePublishTarget, error) {
-	pubTargets, err := s.db.SelectPublishTargetsOfSite(ctx, site.ID)
-	if err != nil {
-		return models.SitePublishTarget{}, err
-	}
-
-	enabledPubTargets := moslice.Filter(pubTargets, func(pubTarget models.SitePublishTarget) bool { return pubTarget.Enabled })
-	if len(enabledPubTargets) == 0 {
-		return models.SitePublishTarget{}, errors.New("no publish targets found")
-	}
-
-	return enabledPubTargets[0], nil
-}
diff --git a/views/_common/nav.html b/views/_common/nav.html
index 5005326..e9c0de7 100644
--- a/views/_common/nav.html
+++ b/views/_common/nav.html
@@ -29,25 +29,7 @@
           <span class="visually-hidden">Publishing...</span>
         </div>
         -->
-        <div class="nav-item dropdown me-2">
-          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            {{ .site.Title }}
-          </a>
-          <ul class="dropdown-menu dropdown-menu-end">
-            {{ range .allSites }}
-              <li><a class="dropdown-item" href="/sites/{{.ID}}/posts">{{.Title}}</a></li>
-            {{ end }}
-            <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" href="/sites/new">New Site…</a></li>
-          </ul>
-        </div>
-        <div class="nav-item dropdown border-end me-3">
-          {{ if .pubTarget }}
-            <a href="{{.pubTarget.BaseURL}}" class="nav-link navbar-site-visit" target="_blank" title="Visit site">
-              <i data-feather="external-link" width="18" height="18"></i>
-            </a>
-          {{ end }}
-        </div>
+
         <div class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
             {{ .user.Username }}
diff --git a/views/index/first-run.html b/views/index/first-run.html
index 3d0483e..239a80d 100644
--- a/views/index/first-run.html
+++ b/views/index/first-run.html
@@ -26,7 +26,7 @@
     </div>
     <div data-first-run-target="pages">
       <div class="text-center mb-4">
-        <p>Enter the details of your blog if you know them.<br>All fields are optional and can be changed later.</p>
+        <p>Enter the details of your blog, if you know them.<br>All fields are optional, and can be changed later.</p>
       </div>
       <div class="mb-2">
         <label for="siteName" class="form-label">Site Name</label>
diff --git a/views/pages/index.html b/views/pages/index.html
index 6755409..3011c64 100644
--- a/views/pages/index.html
+++ b/views/pages/index.html
@@ -29,7 +29,7 @@
     </table>
   {{ else }}
     <div class="h4 m-3 text-center">
-      <div class="position-absolute top-50 start-50 translate-middle">📄<br>No pages yet.</div>
+      <div class="position-absolute top-50 start-50 translate-middle">No pages yet.</div>
     </div>
   {{ end }}
 </main>
diff --git a/views/sitesettings/new.html b/views/sitesettings/new.html
deleted file mode 100644
index b057c72..0000000
--- a/views/sitesettings/new.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="mx-auto p-2" style="width: 400px; margin-block-start: 50px;" data-controller="first-run">
-  <div class="text-center mb-4">
-    <h1>New Site</h1>
-  </div>
-  <form action="/sites" method="post">
-    <div class="text-center mb-4">
-      <p>Enter the details of your blog if you know them.<br>All fields are optional and can be changed later.</p>
-    </div>
-    <div class="mb-2">
-      <label for="siteName" class="form-label">Site Name</label>
-      <input type="text" class="form-control" name="siteName" id="siteName">
-    </div>
-    <div class="mb-3">
-      <label for="siteUrl" class="form-label">Site URL</label>
-      <input type="text" class="form-control" name="siteUrl" id="siteUrl">
-    </div>
-    <div class="mb-3">
-      <label for="netlifySiteId" class="form-label">Netlify Site ID</label>
-      <input type="text" class="form-control" name="netlifySiteId" id="netlifySiteId">
-    </div>
-    <div class="mb-3">
-      <label for="netlifyAPIToken" class="form-label">Netlify API Token</label>
-      <input type="text" class="form-control" name="netlifyAPIToken" id="netlifyAPIToken">
-    </div>
-    <div class="mb-3 text-end">
-      <input type="submit" class="btn btn-primary" value="Create Site">
-    </div>
-  </form>
-</div>
\ No newline at end of file
diff --git a/views/uploads/index.html b/views/uploads/index.html
index 9900b43..3d89215 100644
--- a/views/uploads/index.html
+++ b/views/uploads/index.html
@@ -20,9 +20,5 @@
         </div>
       {{ end }}
     </div>
-  {{ else }}
-  <div class="h4 m-3 text-center">
-    <div class="position-absolute top-50 start-50 translate-middle">🖼️<br>No uploads yet.</div>
-  </div>
   {{ end }}
 </main>
\ No newline at end of file