diff --git a/cmd/motr/proxy.go b/cmd/motr/proxy.go
index c0fe54093..38b7c9bfb 100644
--- a/cmd/motr/proxy.go
+++ b/cmd/motr/proxy.go
@@ -26,6 +26,9 @@ func NewProxyCmd() *cobra.Command {
 			}
 
 			e.GET("/", pages.Home)
+			e.GET("/login", pages.Login)
+			e.GET("/register", pages.Register)
+			e.GET("/profile", pages.Profile)
 			e.GET("/allocate", pages.Profile)
 
 			if err := e.Start(":1323"); err != http.ErrServerClosed {
diff --git a/pkg/nebula/pages/openid.templ b/pkg/nebula/components/grant/view.templ
similarity index 67%
rename from pkg/nebula/pages/openid.templ
rename to pkg/nebula/components/grant/view.templ
index db54ae970..12eefcc79 100644
--- a/pkg/nebula/pages/openid.templ
+++ b/pkg/nebula/components/grant/view.templ
@@ -1,15 +1,11 @@
-package pages
+package grant
 
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
 )
 
-func Authorize(c echo.Context) error {
-	return echoResponse(c, authorizeView(c))
-}
-
-templ authorizeView(c echo.Context) {
+templ View(c echo.Context) {
 	@blocks.Layout("Sonr.ID", true) {
 		@blocks.Card("authorize-view", blocks.SizeMedium) {
 			@blocks.H1("Sonr.ID")
diff --git a/pkg/nebula/pages/openid_templ.go b/pkg/nebula/components/grant/view_templ.go
similarity index 95%
rename from pkg/nebula/pages/openid_templ.go
rename to pkg/nebula/components/grant/view_templ.go
index 6aa854f2a..fc3ee4105 100644
--- a/pkg/nebula/pages/openid_templ.go
+++ b/pkg/nebula/components/grant/view_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.
 
 // templ: version: v0.2.778
-package pages
+package grant
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
@@ -13,11 +13,7 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
 )
 
-func Authorize(c echo.Context) error {
-	return echoResponse(c, authorizeView(c))
-}
-
-func authorizeView(c echo.Context) templ.Component {
+func View(c echo.Context) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
diff --git a/pkg/nebula/components/home/view.templ b/pkg/nebula/components/home/view.templ
new file mode 100644
index 000000000..8e5d5d2d6
--- /dev/null
+++ b/pkg/nebula/components/home/view.templ
@@ -0,0 +1,19 @@
+package home
+
+import (
+	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
+	"github.com/onsonr/sonr/pkg/nebula/models"
+)
+
+templ View(hero *models.Hero) {
+	@blocks.LayoutNoBody("Sonr.ID", true) {
+		@MarketingHeader()
+		@SectionHero(hero)
+		@Highlights()
+		@Features()
+		@Bento()
+		@Lowlights()
+		@CallToAction()
+		@MarketingFooter()
+	}
+}
diff --git a/pkg/nebula/pages/home_templ.go b/pkg/nebula/components/home/view_templ.go
similarity index 80%
rename from pkg/nebula/pages/home_templ.go
rename to pkg/nebula/components/home/view_templ.go
index 5219a0182..97190de17 100644
--- a/pkg/nebula/pages/home_templ.go
+++ b/pkg/nebula/components/home/view_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.
 
 // templ: version: v0.2.778
-package pages
+package home
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
@@ -9,21 +9,11 @@ import "github.com/a-h/templ"
 import templruntime "github.com/a-h/templ/runtime"
 
 import (
-	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
-	"github.com/onsonr/sonr/pkg/nebula/components/home"
 	"github.com/onsonr/sonr/pkg/nebula/models"
 )
 
-func Home(c echo.Context) error {
-	mdls, err := models.GetModels()
-	if err != nil {
-		return err
-	}
-	return echoResponse(c, homeView(mdls.Hero))
-}
-
-func homeView(hero *models.Hero) templ.Component {
+func View(hero *models.Hero) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -56,7 +46,7 @@ func homeView(hero *models.Hero) templ.Component {
 				}()
 			}
 			ctx = templ.InitializeContext(ctx)
-			templ_7745c5c3_Err = home.MarketingHeader().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = MarketingHeader().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -64,7 +54,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.SectionHero(hero).Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = SectionHero(hero).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -72,7 +62,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.Highlights().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = Highlights().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -80,7 +70,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.Features().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = Features().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -88,7 +78,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.Bento().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = Bento().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -96,7 +86,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.Lowlights().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = Lowlights().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -104,7 +94,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.CallToAction().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = CallToAction().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -112,7 +102,7 @@ func homeView(hero *models.Hero) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = home.MarketingFooter().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = MarketingFooter().Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
diff --git a/pkg/nebula/components/login/modal.templ b/pkg/nebula/components/login/modal.templ
new file mode 100644
index 000000000..cc600fd06
--- /dev/null
+++ b/pkg/nebula/components/login/modal.templ
@@ -0,0 +1,74 @@
+package login
+
+import "github.com/labstack/echo/v4"
+
+templ Modal(c echo.Context) {
+	<div
+		x-data="{ fullscreenModal: true }"
+		x-init="
+    $watch('fullscreenModal', function(value){
+            if(value === true){
+                document.body.classList.add('overflow-hidden');
+            }else{
+                document.body.classList.remove('overflow-hidden');
+            }
+        })
+    "
+		@keydown.escape="fullscreenModal=false"
+	>
+		<button @click="fullscreenModal=true" class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors bg-white border rounded-md hover:bg-neutral-100 active:bg-white focus:bg-white focus:outline-none focus:ring-2 focus:ring-neutral-200/60 focus:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none">Preview</button>
+		<template x-teleport="body">
+			<div
+				x-show="fullscreenModal"
+				x-transition:enter="transition ease-out duration-300"
+				x-transition:enter-start="translate-y-full"
+				x-transition:enter-end="translate-y-0"
+				x-transition:leave="transition ease-in duration-300"
+				x-transition:leave-start="translate-y-0"
+				x-transition:leave-end="translate-y-full"
+				class="flex fixed inset-0 z-[99] w-screen h-screen bg-white"
+			>
+				<button @click="fullscreenModal=false" class="absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-3 mr-3 space-x-1 text-xs font-medium uppercase border rounded-md border-neutral-200 lg:border-white/20 lg:bg-black/10 hover:lg:bg-black/30 text-neutral-600 lg:text-white hover:bg-neutral-100">
+					<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4"><path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path></svg>
+					<span>Close</span>
+				</button>
+				<div class="relative flex flex-wrap items-center w-full h-full px-8">
+					<div class="relative w-full max-w-sm mx-auto lg:mb-0">
+						<div class="relative text-center">
+							<div class="flex flex-col mb-6 space-y-2">
+								<h1 class="text-2xl font-semibold tracking-tight">Create an account</h1>
+								<p class="text-sm text-neutral-500">Enter your email below to create your account</p>
+							</div>
+							<form onsubmit="event.preventDefault();" class="space-y-2">
+								<input type="text" placeholder="name@example.com" class="flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md border-neutral-300 ring-offset-background placeholder:text-neutral-500 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50"/>
+								<button type="button" class="inline-flex items-center justify-center w-full h-10 px-4 py-2 text-sm font-medium tracking-wide text-white transition-colors duration-200 rounded-md bg-neutral-950 hover:bg-neutral-900 focus:ring-2 focus:ring-offset-2 focus:ring-neutral-900 focus:shadow-outline focus:outline-none">
+									Sign up with Email
+								</button>
+								<div class="relative py-6">
+									<div class="absolute inset-0 flex items-center"><span class="w-full border-t"></span></div>
+									<div class="relative flex justify-center text-xs uppercase">
+										<span class="px-2 bg-white text-neutral-500">Or continue with</span>
+									</div>
+								</div>
+								<button class="inline-flex items-center justify-center w-full h-10 px-4 py-2 text-sm font-medium border rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none border-input hover:bg-neutral-100" type="button">
+									<svg viewBox="0 0 438.549 438.549" class="w-4 h-4 mr-2"><path fill="currentColor" d="M409.132 114.573c-19.608-33.596-46.205-60.194-79.798-79.8-33.598-19.607-70.277-29.408-110.063-29.408-39.781 0-76.472 9.804-110.063 29.408-33.596 19.605-60.192 46.204-79.8 79.8C9.803 148.168 0 184.854 0 224.63c0 47.78 13.94 90.745 41.827 128.906 27.884 38.164 63.906 64.572 108.063 79.227 5.14.954 8.945.283 11.419-1.996 2.475-2.282 3.711-5.14 3.711-8.562 0-.571-.049-5.708-.144-15.417a2549.81 2549.81 0 01-.144-25.406l-6.567 1.136c-4.187.767-9.469 1.092-15.846 1-6.374-.089-12.991-.757-19.842-1.999-6.854-1.231-13.229-4.086-19.13-8.559-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-.951-2.568-2.098-3.711-3.429-1.142-1.331-1.997-2.663-2.568-3.997-.572-1.335-.098-2.43 1.427-3.289 1.525-.859 4.281-1.276 8.28-1.276l5.708.853c3.807.763 8.516 3.042 14.133 6.851 5.614 3.806 10.229 8.754 13.846 14.842 4.38 7.806 9.657 13.754 15.846 17.847 6.184 4.093 12.419 6.136 18.699 6.136 6.28 0 11.704-.476 16.274-1.423 4.565-.952 8.848-2.383 12.847-4.285 1.713-12.758 6.377-22.559 13.988-29.41-10.848-1.14-20.601-2.857-29.264-5.14-8.658-2.286-17.605-5.996-26.835-11.14-9.235-5.137-16.896-11.516-22.985-19.126-6.09-7.614-11.088-17.61-14.987-29.979-3.901-12.374-5.852-26.648-5.852-42.826 0-23.035 7.52-42.637 22.557-58.817-7.044-17.318-6.379-36.732 1.997-58.24 5.52-1.715 13.706-.428 24.554 3.853 10.85 4.283 18.794 7.952 23.84 10.994 5.046 3.041 9.089 5.618 12.135 7.708 17.705-4.947 35.976-7.421 54.818-7.421s37.117 2.474 54.823 7.421l10.849-6.849c7.419-4.57 16.18-8.758 26.262-12.565 10.088-3.805 17.802-4.853 23.134-3.138 8.562 21.509 9.325 40.922 2.279 58.24 15.036 16.18 22.559 35.787 22.559 58.817 0 16.178-1.958 30.497-5.853 42.966-3.9 12.471-8.941 22.457-15.125 29.979-6.191 7.521-13.901 13.85-23.131 18.986-9.232 5.14-18.182 8.85-26.84 11.136-8.662 2.286-18.415 4.004-29.263 5.146 9.894 8.562 14.842 22.077 14.842 40.539v60.237c0 3.422 1.19 6.279 3.572 8.562 2.379 2.279 6.136 2.95 11.276 1.995 44.163-14.653 80.185-41.062 108.068-79.226 27.88-38.161 41.825-81.126 41.825-128.906-.01-39.771-9.818-76.454-29.414-110.049z"></path></svg>
+									<span>Github</span>
+								</button>
+							</form>
+						</div>
+						<p class="mt-6 text-sm text-center text-neutral-500">Already have an account? <a href="#_" class="relative font-medium text-blue-600 group"><span>Login here</span><span class="absolute bottom-0 left-0 w-0 group-hover:w-full ease-out duration-300 h-0.5 bg-blue-600"></span></a></p>
+						<p class="px-8 mt-1 text-sm text-center text-neutral-500">By continuing, you agree to our <a class="underline underline-offset-4 hover:text-primary" href="/terms">Terms</a> and <a class="underline underline-offset-4 hover:text-primary" href="/privacy">Policy</a>.</p>
+					</div>
+				</div>
+				<div class="relative top-0 bottom-0 right-0 flex-shrink-0 hidden w-1/3 overflow-hidden bg-cover lg:block">
+					<a href="#_" class="absolute bottom-0 right-0 z-30 inline-flex items-end mb-4 mr-3 font-sans text-2xl font-extrabold text-left text-white no-underline bg-transparent cursor-pointer group focus:no-underline">
+						<svg class="w-auto h-4 text-white fill-current lg:h-5" viewBox="0 0 355 99" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M119.1 87V66.4h19.8c34.3 0 34.2-49.5 0-49.5-11 0-22 .1-33 .1v70h13.2zm19.8-32.7h-19.8V29.5h19.8c16.8 0 16.9 24.8 0 24.8zm32.6-30.5c0 9.5 14.4 9.5 14.4 0s-14.4-9.5-14.4 0zM184.8 87V37.5h-12.2V87h12.2zm22.8 0V61.8c0-7.5 5.1-13.8 12.6-13.8 7.8 0 11.9 5.7 11.9 13.2V87h12.2V61.1c0-15.5-9.3-24.2-20.9-24.2-6.2 0-11.2 2.5-16.2 7.4l-.8-6.7h-10.9V87h12.1zm72.1 1.3c7.5 0 16-2.6 21.2-8l-7.8-7.7c-2.8 2.9-8.7 4.6-13.2 4.6-8.6 0-13.9-4.4-14.7-10.5h38.5c1.9-20.3-8.4-30.5-24.9-30.5-16 0-26.2 10.8-26.2 25.8 0 15.8 10.1 26.3 27.1 26.3zM292 56.6h-26.6c1.8-6.4 7.2-9.6 13.8-9.6 7 0 12 3.2 12.8 9.6zm41.2 32.1c14.1 0 21.2-7.5 21.2-16.2 0-13.1-11.8-15.2-21.1-15.8-6.3-.4-9.2-2.2-9.2-5.4 0-3.1 3.2-4.9 9-4.9 4.7 0 8.7 1.1 12.2 4.4l6.8-8c-5.7-5-11.5-6.5-19.2-6.5-9 0-20.8 4-20.8 15.4 0 11.2 11.1 14.6 20.4 15.3 7 .4 9.8 1.8 9.8 5.2 0 3.6-4.3 6-8.9 5.9-5.5-.1-13.5-3-17-6.9l-6 8.7c7.2 7.5 15 8.8 22.8 8.8z" id="a"></path></defs><g fill="none" fill-rule="evenodd"><g fill="currentColor"><path d="M19.742 49h28.516L68 83H0l19.742-34z"></path><path d="M26 69h14v30H26V69zM4 50L33.127 0 63 50H4z"></path></g><g fill-rule="nonzero"><use fill="currentColor" xlink:href="#a"></use><use fill="currentColor" xlink:href="#a"></use></g></g></svg>
+						<span class="flex opacity-90 group-hover:scale-150 group-hover:opacity-100 items-center h-full group-hover:-rotate-6 ease-out duration-500 px-0.5 py-px ml-2 -translate-x-px text-[0.6rem] font-bold leading-none border-[2px] rounded border-white -translate-y-px">UI</span>
+					</a>
+					<div class="absolute inset-0 z-20 w-full h-full opacity-70 bg-gradient-to-t from-black"></div>
+					<img src="https://cdn.devdojo.com/images/may2023/pines-bg-2.png" class="z-10 object-cover w-full h-full"/>
+				</div>
+			</div>
+		</template>
+	</div>
+}
diff --git a/pkg/nebula/components/login/modal_templ.go b/pkg/nebula/components/login/modal_templ.go
new file mode 100644
index 000000000..21ae8bc19
--- /dev/null
+++ b/pkg/nebula/components/login/modal_templ.go
@@ -0,0 +1,42 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.778
+package login
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import "github.com/labstack/echo/v4"
+
+func Modal(c echo.Context) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div x-data=\"{ fullscreenModal: true }\" x-init=\"\n    $watch(&#39;fullscreenModal&#39;, function(value){\n            if(value === true){\n                document.body.classList.add(&#39;overflow-hidden&#39;);\n            }else{\n                document.body.classList.remove(&#39;overflow-hidden&#39;);\n            }\n        })\n    \" @keydown.escape=\"fullscreenModal=false\"><button @click=\"fullscreenModal=true\" class=\"inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors bg-white border rounded-md hover:bg-neutral-100 active:bg-white focus:bg-white focus:outline-none focus:ring-2 focus:ring-neutral-200/60 focus:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none\">Preview</button><template x-teleport=\"body\"><div x-show=\"fullscreenModal\" x-transition:enter=\"transition ease-out duration-300\" x-transition:enter-start=\"translate-y-full\" x-transition:enter-end=\"translate-y-0\" x-transition:leave=\"transition ease-in duration-300\" x-transition:leave-start=\"translate-y-0\" x-transition:leave-end=\"translate-y-full\" class=\"flex fixed inset-0 z-[99] w-screen h-screen bg-white\"><button @click=\"fullscreenModal=false\" class=\"absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-3 mr-3 space-x-1 text-xs font-medium uppercase border rounded-md border-neutral-200 lg:border-white/20 lg:bg-black/10 hover:lg:bg-black/30 text-neutral-600 lg:text-white hover:bg-neutral-100\"><svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.5\" stroke=\"currentColor\" class=\"w-4 h-4\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M6 18L18 6M6 6l12 12\"></path></svg> <span>Close</span></button><div class=\"relative flex flex-wrap items-center w-full h-full px-8\"><div class=\"relative w-full max-w-sm mx-auto lg:mb-0\"><div class=\"relative text-center\"><div class=\"flex flex-col mb-6 space-y-2\"><h1 class=\"text-2xl font-semibold tracking-tight\">Create an account</h1><p class=\"text-sm text-neutral-500\">Enter your email below to create your account</p></div><form onsubmit=\"event.preventDefault();\" class=\"space-y-2\"><input type=\"text\" placeholder=\"name@example.com\" class=\"flex w-full h-10 px-3 py-2 text-sm bg-white border rounded-md border-neutral-300 ring-offset-background placeholder:text-neutral-500 focus:border-neutral-300 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-neutral-400 disabled:cursor-not-allowed disabled:opacity-50\"> <button type=\"button\" class=\"inline-flex items-center justify-center w-full h-10 px-4 py-2 text-sm font-medium tracking-wide text-white transition-colors duration-200 rounded-md bg-neutral-950 hover:bg-neutral-900 focus:ring-2 focus:ring-offset-2 focus:ring-neutral-900 focus:shadow-outline focus:outline-none\">Sign up with Email</button><div class=\"relative py-6\"><div class=\"absolute inset-0 flex items-center\"><span class=\"w-full border-t\"></span></div><div class=\"relative flex justify-center text-xs uppercase\"><span class=\"px-2 bg-white text-neutral-500\">Or continue with</span></div></div><button class=\"inline-flex items-center justify-center w-full h-10 px-4 py-2 text-sm font-medium border rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none border-input hover:bg-neutral-100\" type=\"button\"><svg viewBox=\"0 0 438.549 438.549\" class=\"w-4 h-4 mr-2\"><path fill=\"currentColor\" d=\"M409.132 114.573c-19.608-33.596-46.205-60.194-79.798-79.8-33.598-19.607-70.277-29.408-110.063-29.408-39.781 0-76.472 9.804-110.063 29.408-33.596 19.605-60.192 46.204-79.8 79.8C9.803 148.168 0 184.854 0 224.63c0 47.78 13.94 90.745 41.827 128.906 27.884 38.164 63.906 64.572 108.063 79.227 5.14.954 8.945.283 11.419-1.996 2.475-2.282 3.711-5.14 3.711-8.562 0-.571-.049-5.708-.144-15.417a2549.81 2549.81 0 01-.144-25.406l-6.567 1.136c-4.187.767-9.469 1.092-15.846 1-6.374-.089-12.991-.757-19.842-1.999-6.854-1.231-13.229-4.086-19.13-8.559-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-.951-2.568-2.098-3.711-3.429-1.142-1.331-1.997-2.663-2.568-3.997-.572-1.335-.098-2.43 1.427-3.289 1.525-.859 4.281-1.276 8.28-1.276l5.708.853c3.807.763 8.516 3.042 14.133 6.851 5.614 3.806 10.229 8.754 13.846 14.842 4.38 7.806 9.657 13.754 15.846 17.847 6.184 4.093 12.419 6.136 18.699 6.136 6.28 0 11.704-.476 16.274-1.423 4.565-.952 8.848-2.383 12.847-4.285 1.713-12.758 6.377-22.559 13.988-29.41-10.848-1.14-20.601-2.857-29.264-5.14-8.658-2.286-17.605-5.996-26.835-11.14-9.235-5.137-16.896-11.516-22.985-19.126-6.09-7.614-11.088-17.61-14.987-29.979-3.901-12.374-5.852-26.648-5.852-42.826 0-23.035 7.52-42.637 22.557-58.817-7.044-17.318-6.379-36.732 1.997-58.24 5.52-1.715 13.706-.428 24.554 3.853 10.85 4.283 18.794 7.952 23.84 10.994 5.046 3.041 9.089 5.618 12.135 7.708 17.705-4.947 35.976-7.421 54.818-7.421s37.117 2.474 54.823 7.421l10.849-6.849c7.419-4.57 16.18-8.758 26.262-12.565 10.088-3.805 17.802-4.853 23.134-3.138 8.562 21.509 9.325 40.922 2.279 58.24 15.036 16.18 22.559 35.787 22.559 58.817 0 16.178-1.958 30.497-5.853 42.966-3.9 12.471-8.941 22.457-15.125 29.979-6.191 7.521-13.901 13.85-23.131 18.986-9.232 5.14-18.182 8.85-26.84 11.136-8.662 2.286-18.415 4.004-29.263 5.146 9.894 8.562 14.842 22.077 14.842 40.539v60.237c0 3.422 1.19 6.279 3.572 8.562 2.379 2.279 6.136 2.95 11.276 1.995 44.163-14.653 80.185-41.062 108.068-79.226 27.88-38.161 41.825-81.126 41.825-128.906-.01-39.771-9.818-76.454-29.414-110.049z\"></path></svg> <span>Github</span></button></form></div><p class=\"mt-6 text-sm text-center text-neutral-500\">Already have an account? <a href=\"#_\" class=\"relative font-medium text-blue-600 group\"><span>Login here</span><span class=\"absolute bottom-0 left-0 w-0 group-hover:w-full ease-out duration-300 h-0.5 bg-blue-600\"></span></a></p><p class=\"px-8 mt-1 text-sm text-center text-neutral-500\">By continuing, you agree to our <a class=\"underline underline-offset-4 hover:text-primary\" href=\"/terms\">Terms</a> and <a class=\"underline underline-offset-4 hover:text-primary\" href=\"/privacy\">Policy</a>.</p></div></div><div class=\"relative top-0 bottom-0 right-0 flex-shrink-0 hidden w-1/3 overflow-hidden bg-cover lg:block\"><a href=\"#_\" class=\"absolute bottom-0 right-0 z-30 inline-flex items-end mb-4 mr-3 font-sans text-2xl font-extrabold text-left text-white no-underline bg-transparent cursor-pointer group focus:no-underline\"><svg class=\"w-auto h-4 text-white fill-current lg:h-5\" viewBox=\"0 0 355 99\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><defs><path d=\"M119.1 87V66.4h19.8c34.3 0 34.2-49.5 0-49.5-11 0-22 .1-33 .1v70h13.2zm19.8-32.7h-19.8V29.5h19.8c16.8 0 16.9 24.8 0 24.8zm32.6-30.5c0 9.5 14.4 9.5 14.4 0s-14.4-9.5-14.4 0zM184.8 87V37.5h-12.2V87h12.2zm22.8 0V61.8c0-7.5 5.1-13.8 12.6-13.8 7.8 0 11.9 5.7 11.9 13.2V87h12.2V61.1c0-15.5-9.3-24.2-20.9-24.2-6.2 0-11.2 2.5-16.2 7.4l-.8-6.7h-10.9V87h12.1zm72.1 1.3c7.5 0 16-2.6 21.2-8l-7.8-7.7c-2.8 2.9-8.7 4.6-13.2 4.6-8.6 0-13.9-4.4-14.7-10.5h38.5c1.9-20.3-8.4-30.5-24.9-30.5-16 0-26.2 10.8-26.2 25.8 0 15.8 10.1 26.3 27.1 26.3zM292 56.6h-26.6c1.8-6.4 7.2-9.6 13.8-9.6 7 0 12 3.2 12.8 9.6zm41.2 32.1c14.1 0 21.2-7.5 21.2-16.2 0-13.1-11.8-15.2-21.1-15.8-6.3-.4-9.2-2.2-9.2-5.4 0-3.1 3.2-4.9 9-4.9 4.7 0 8.7 1.1 12.2 4.4l6.8-8c-5.7-5-11.5-6.5-19.2-6.5-9 0-20.8 4-20.8 15.4 0 11.2 11.1 14.6 20.4 15.3 7 .4 9.8 1.8 9.8 5.2 0 3.6-4.3 6-8.9 5.9-5.5-.1-13.5-3-17-6.9l-6 8.7c7.2 7.5 15 8.8 22.8 8.8z\" id=\"a\"></path></defs><g fill=\"none\" fill-rule=\"evenodd\"><g fill=\"currentColor\"><path d=\"M19.742 49h28.516L68 83H0l19.742-34z\"></path><path d=\"M26 69h14v30H26V69zM4 50L33.127 0 63 50H4z\"></path></g><g fill-rule=\"nonzero\"><use fill=\"currentColor\" xlink:href=\"#a\"></use><use fill=\"currentColor\" xlink:href=\"#a\"></use></g></g></svg> <span class=\"flex opacity-90 group-hover:scale-150 group-hover:opacity-100 items-center h-full group-hover:-rotate-6 ease-out duration-500 px-0.5 py-px ml-2 -translate-x-px text-[0.6rem] font-bold leading-none border-[2px] rounded border-white -translate-y-px\">UI</span></a><div class=\"absolute inset-0 z-20 w-full h-full opacity-70 bg-gradient-to-t from-black\"></div><img src=\"https://cdn.devdojo.com/images/may2023/pines-bg-2.png\" class=\"z-10 object-cover w-full h-full\"></div></div></template></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/pkg/nebula/pages/login.templ b/pkg/nebula/components/login/view.templ
similarity index 77%
rename from pkg/nebula/pages/login.templ
rename to pkg/nebula/components/login/view.templ
index 290cf78e3..822362fb8 100644
--- a/pkg/nebula/pages/login.templ
+++ b/pkg/nebula/components/login/view.templ
@@ -1,15 +1,11 @@
-package pages
+package login
 
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
 )
 
-func Login(c echo.Context) error {
-	return echoResponse(c, loginView(c))
-}
-
-templ loginView(c echo.Context) {
+templ View(c echo.Context) {
 	@blocks.Layout("Sonr.ID", true) {
 		@blocks.Card("login-view", blocks.SizeLarge) {
 			@blocks.H1("Sonr.ID")
diff --git a/pkg/nebula/pages/login_templ.go b/pkg/nebula/components/login/view_templ.go
similarity index 97%
rename from pkg/nebula/pages/login_templ.go
rename to pkg/nebula/components/login/view_templ.go
index a3c85fbee..7d5b0b744 100644
--- a/pkg/nebula/pages/login_templ.go
+++ b/pkg/nebula/components/login/view_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.
 
 // templ: version: v0.2.778
-package pages
+package login
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
@@ -13,11 +13,7 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
 )
 
-func Login(c echo.Context) error {
-	return echoResponse(c, loginView(c))
-}
-
-func loginView(c echo.Context) templ.Component {
+func View(c echo.Context) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
diff --git a/pkg/nebula/pages/profile.templ b/pkg/nebula/components/profile/view.templ
similarity index 64%
rename from pkg/nebula/pages/profile.templ
rename to pkg/nebula/components/profile/view.templ
index 82d6961b0..cbcded882 100644
--- a/pkg/nebula/pages/profile.templ
+++ b/pkg/nebula/components/profile/view.templ
@@ -1,15 +1,11 @@
-package pages
+package profile
 
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
 )
 
-func Profile(c echo.Context) error {
-	return echoResponse(c, profileView(c))
-}
-
-templ profileView(c echo.Context) {
+templ View(c echo.Context) {
 	@blocks.Layout("Sonr.ID", true) {
 		@blocks.Card("profile-view", blocks.SizeLarge) {
 			@blocks.ProfileCard()
diff --git a/pkg/nebula/pages/profile_templ.go b/pkg/nebula/components/profile/view_templ.go
similarity index 95%
rename from pkg/nebula/pages/profile_templ.go
rename to pkg/nebula/components/profile/view_templ.go
index d19329074..35ed75868 100644
--- a/pkg/nebula/pages/profile_templ.go
+++ b/pkg/nebula/components/profile/view_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.
 
 // templ: version: v0.2.778
-package pages
+package profile
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
@@ -13,11 +13,7 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
 )
 
-func Profile(c echo.Context) error {
-	return echoResponse(c, profileView(c))
-}
-
-func profileView(c echo.Context) templ.Component {
+func View(c echo.Context) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
diff --git a/pkg/nebula/components/register/modal.templ b/pkg/nebula/components/register/modal.templ
new file mode 100644
index 000000000..6d8576d86
--- /dev/null
+++ b/pkg/nebula/components/register/modal.templ
@@ -0,0 +1,66 @@
+package register
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
+	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
+)
+
+templ Modal(c echo.Context) {
+	<div
+		x-data="{ modalOpen: true }"
+		@keydown.escape.window="modalOpen = false"
+		:class="{ 'z-40': modalOpen }"
+		class="relative w-auto h-auto"
+	>
+		<button @click="modalOpen=true" class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors bg-white border rounded-md hover:bg-neutral-100 active:bg-white focus:bg-white focus:outline-none focus:ring-2 focus:ring-neutral-200/60 focus:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none">Open</button>
+		<template x-teleport="body">
+			<div x-show="modalOpen" class="fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen" x-cloak>
+				<div
+					x-show="modalOpen"
+					x-transition:enter="ease-out duration-300"
+					x-transition:enter-start="opacity-0"
+					x-transition:enter-end="opacity-100"
+					x-transition:leave="ease-in duration-300"
+					x-transition:leave-start="opacity-100"
+					x-transition:leave-end="opacity-0"
+					@click="modalOpen=false"
+					class="absolute inset-0 w-full h-full bg-gray-900 bg-opacity-50 backdrop-blur-sm"
+				></div>
+				<div
+					x-show="modalOpen"
+					x-trap.inert.noscroll="modalOpen"
+					x-transition:enter="ease-out duration-300"
+					x-transition:enter-start="opacity-0 scale-90"
+					x-transition:enter-end="opacity-100 scale-100"
+					x-transition:leave="ease-in duration-200"
+					x-transition:leave-start="opacity-100 scale-100"
+					x-transition:leave-end="opacity-0 scale-90"
+					class="relative w-full py-6 bg-white shadow-md px-7 bg-opacity-90 drop-shadow-md backdrop-blur-sm sm:max-w-lg sm:rounded-lg"
+				>
+					<div class="flex items-center justify-between pb-3">
+						<h3 class="text-lg font-semibold">Modal Title</h3>
+						<button @click="modalOpen=false" class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-gray-600 rounded-full hover:text-gray-800 hover:bg-gray-50">
+							<svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"></path></svg>
+						</button>
+					</div>
+					<div class="relative w-auto pb-8">
+						<p>This is placeholder text. Replace it with your own content.</p>
+					</div>
+					@blocks.H2("Account Registration")
+					@blocks.Spacer()
+					@blocks.Breadcrumbs()
+					@basicInfoForm(formstate.Initial)
+					@blocks.Spacer()
+					@blocks.Button(blocks.GET("/", "#register-view")) {
+						@blocks.Text("Cancel")
+					}
+					<div class="flex flex-col-reverse sm:flex-row sm:justify-between sm:space-x-2">
+						<button @click="modalOpen=false" type="button" class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors border rounded-md focus:outline-none focus:ring-2 focus:ring-neutral-100 focus:ring-offset-2">Previous</button>
+						<button @click="modalOpen=false" type="button" class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium text-white transition-colors border border-transparent rounded-md focus:outline-none focus:ring-2 focus:ring-neutral-900 focus:ring-offset-2 bg-neutral-950 hover:bg-neutral-900">Next</button>
+					</div>
+				</div>
+			</div>
+		</template>
+	</div>
+}
diff --git a/pkg/nebula/components/register/modal_templ.go b/pkg/nebula/components/register/modal_templ.go
new file mode 100644
index 000000000..bdbff4358
--- /dev/null
+++ b/pkg/nebula/components/register/modal_templ.go
@@ -0,0 +1,92 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.778
+package register
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import templruntime "github.com/a-h/templ/runtime"
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
+	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
+)
+
+func Modal(c echo.Context) templ.Component {
+	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+			return templ_7745c5c3_CtxErr
+		}
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+		if !templ_7745c5c3_IsBuffer {
+			defer func() {
+				templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err == nil {
+					templ_7745c5c3_Err = templ_7745c5c3_BufErr
+				}
+			}()
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div x-data=\"{ modalOpen: true }\" @keydown.escape.window=\"modalOpen = false\" :class=\"{ &#39;z-40&#39;: modalOpen }\" class=\"relative w-auto h-auto\"><button @click=\"modalOpen=true\" class=\"inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors bg-white border rounded-md hover:bg-neutral-100 active:bg-white focus:bg-white focus:outline-none focus:ring-2 focus:ring-neutral-200/60 focus:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none\">Open</button><template x-teleport=\"body\"><div x-show=\"modalOpen\" class=\"fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen\" x-cloak><div x-show=\"modalOpen\" x-transition:enter=\"ease-out duration-300\" x-transition:enter-start=\"opacity-0\" x-transition:enter-end=\"opacity-100\" x-transition:leave=\"ease-in duration-300\" x-transition:leave-start=\"opacity-100\" x-transition:leave-end=\"opacity-0\" @click=\"modalOpen=false\" class=\"absolute inset-0 w-full h-full bg-gray-900 bg-opacity-50 backdrop-blur-sm\"></div><div x-show=\"modalOpen\" x-trap.inert.noscroll=\"modalOpen\" x-transition:enter=\"ease-out duration-300\" x-transition:enter-start=\"opacity-0 scale-90\" x-transition:enter-end=\"opacity-100 scale-100\" x-transition:leave=\"ease-in duration-200\" x-transition:leave-start=\"opacity-100 scale-100\" x-transition:leave-end=\"opacity-0 scale-90\" class=\"relative w-full py-6 bg-white shadow-md px-7 bg-opacity-90 drop-shadow-md backdrop-blur-sm sm:max-w-lg sm:rounded-lg\"><div class=\"flex items-center justify-between pb-3\"><h3 class=\"text-lg font-semibold\">Modal Title</h3><button @click=\"modalOpen=false\" class=\"absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-gray-600 rounded-full hover:text-gray-800 hover:bg-gray-50\"><svg class=\"w-5 h-5\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" stroke-width=\"1.5\" stroke=\"currentColor\"><path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M6 18L18 6M6 6l12 12\"></path></svg></button></div><div class=\"relative w-auto pb-8\"><p>This is placeholder text. Replace it with your own content.</p></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = blocks.H2("Account Registration").Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = blocks.Spacer().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = blocks.Breadcrumbs().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = basicInfoForm(formstate.Initial).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = blocks.Spacer().Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+			templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
+			if !templ_7745c5c3_IsBuffer {
+				defer func() {
+					templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+					if templ_7745c5c3_Err == nil {
+						templ_7745c5c3_Err = templ_7745c5c3_BufErr
+					}
+				}()
+			}
+			ctx = templ.InitializeContext(ctx)
+			templ_7745c5c3_Err = blocks.Text("Cancel").Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = blocks.Button(blocks.GET("/", "#register-view")).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"flex flex-col-reverse sm:flex-row sm:justify-between sm:space-x-2\"><button @click=\"modalOpen=false\" type=\"button\" class=\"inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors border rounded-md focus:outline-none focus:ring-2 focus:ring-neutral-100 focus:ring-offset-2\">Previous</button> <button @click=\"modalOpen=false\" type=\"button\" class=\"inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium text-white transition-colors border border-transparent rounded-md focus:outline-none focus:ring-2 focus:ring-neutral-900 focus:ring-offset-2 bg-neutral-950 hover:bg-neutral-900\">Next</button></div></div></div></template></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+var _ = templruntime.GeneratedTemplate
diff --git a/pkg/nebula/pages/register.templ b/pkg/nebula/components/register/view.templ
similarity index 93%
rename from pkg/nebula/pages/register.templ
rename to pkg/nebula/components/register/view.templ
index 7dbf62e14..c5d2ca951 100644
--- a/pkg/nebula/pages/register.templ
+++ b/pkg/nebula/components/register/view.templ
@@ -1,4 +1,4 @@
-package pages
+package register
 
 import (
 	"github.com/labstack/echo/v4"
@@ -6,11 +6,7 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
 )
 
-func Register(c echo.Context) error {
-	return echoResponse(c, registerView(c))
-}
-
-templ registerView(c echo.Context) {
+templ View(c echo.Context) {
 	@blocks.Layout("Sonr.ID", true) {
 		@blocks.Card("register-view", blocks.SizeMedium) {
 			@blocks.H2("Account Registration")
diff --git a/pkg/nebula/pages/register_templ.go b/pkg/nebula/components/register/view_templ.go
similarity index 98%
rename from pkg/nebula/pages/register_templ.go
rename to pkg/nebula/components/register/view_templ.go
index a419fd775..8db4b3e64 100644
--- a/pkg/nebula/pages/register_templ.go
+++ b/pkg/nebula/components/register/view_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.
 
 // templ: version: v0.2.778
-package pages
+package register
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
@@ -14,11 +14,7 @@ import (
 	"github.com/onsonr/sonr/pkg/nebula/models/formstate"
 )
 
-func Register(c echo.Context) error {
-	return echoResponse(c, registerView(c))
-}
-
-func registerView(c echo.Context) templ.Component {
+func View(c echo.Context) templ.Component {
 	return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
 		if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
diff --git a/pkg/nebula/nebula.go b/pkg/nebula/nebula.go
index 8cde2b5f9..8a06ce455 100644
--- a/pkg/nebula/nebula.go
+++ b/pkg/nebula/nebula.go
@@ -14,7 +14,7 @@ import (
 //go:embed assets
 var embeddedFiles embed.FS
 
-//go:embed assets/static.pkl
+//go:embed nebula.pkl
 var config []byte
 
 func getHTTPFS() (http.FileSystem, error) {
diff --git a/pkg/nebula/assets/static.pkl b/pkg/nebula/nebula.pkl
similarity index 90%
rename from pkg/nebula/assets/static.pkl
rename to pkg/nebula/nebula.pkl
index d8f6de5f5..7c50c3c67 100644
--- a/pkg/nebula/assets/static.pkl
+++ b/pkg/nebula/nebula.pkl
@@ -14,9 +14,9 @@ hero = new Hero {
 		href = "/about";
 	};
 	image = new Image {
-		src = "https://cdn.sonr.id/img/hero-clipped.svg";
-		width = "560";
-		height = "560";
+		src = "https://cdn.sonr.id/img/hero-clipped.png";
+		width = "520";
+		height = "520";
 	};
 };
 
diff --git a/pkg/nebula/pages/grant.go b/pkg/nebula/pages/grant.go
new file mode 100644
index 000000000..96beb6b6e
--- /dev/null
+++ b/pkg/nebula/pages/grant.go
@@ -0,0 +1,11 @@
+package pages
+
+import (
+	"github.com/labstack/echo/v4"
+
+	"github.com/onsonr/sonr/pkg/nebula/components/grant"
+)
+
+func Authorize(c echo.Context) error {
+	return echoResponse(c, grant.View(c))
+}
diff --git a/pkg/nebula/pages/home.go b/pkg/nebula/pages/home.go
new file mode 100644
index 000000000..98c70ecf3
--- /dev/null
+++ b/pkg/nebula/pages/home.go
@@ -0,0 +1,15 @@
+package pages
+
+import (
+	"github.com/labstack/echo/v4"
+	"github.com/onsonr/sonr/pkg/nebula/components/home"
+	"github.com/onsonr/sonr/pkg/nebula/models"
+)
+
+func Home(c echo.Context) error {
+	mdls, err := models.GetModels()
+	if err != nil {
+		return err
+	}
+	return echoResponse(c, home.View(mdls.Hero))
+}
diff --git a/pkg/nebula/pages/home.templ b/pkg/nebula/pages/home.templ
deleted file mode 100644
index aa23c357b..000000000
--- a/pkg/nebula/pages/home.templ
+++ /dev/null
@@ -1,29 +0,0 @@
-package pages
-
-import (
-	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/pkg/nebula/components/blocks"
-	"github.com/onsonr/sonr/pkg/nebula/components/home"
-	"github.com/onsonr/sonr/pkg/nebula/models"
-)
-
-func Home(c echo.Context) error {
-	mdls, err := models.GetModels()
-	if err != nil {
-		return err
-	}
-	return echoResponse(c, homeView(mdls.Hero))
-}
-
-templ homeView(hero *models.Hero) {
-	@blocks.LayoutNoBody("Sonr.ID", true) {
-		@home.MarketingHeader()
-		@home.SectionHero(hero)
-		@home.Highlights()
-		@home.Features()
-		@home.Bento()
-		@home.Lowlights()
-		@home.CallToAction()
-		@home.MarketingFooter()
-	}
-}
diff --git a/pkg/nebula/pages/login.go b/pkg/nebula/pages/login.go
new file mode 100644
index 000000000..0541968d3
--- /dev/null
+++ b/pkg/nebula/pages/login.go
@@ -0,0 +1,11 @@
+package pages
+
+import (
+	"github.com/labstack/echo/v4"
+
+	"github.com/onsonr/sonr/pkg/nebula/components/login"
+)
+
+func Login(c echo.Context) error {
+	return echoResponse(c, login.Modal(c))
+}
diff --git a/pkg/nebula/pages/profile.go b/pkg/nebula/pages/profile.go
new file mode 100644
index 000000000..af7cbdeaa
--- /dev/null
+++ b/pkg/nebula/pages/profile.go
@@ -0,0 +1,11 @@
+package pages
+
+import (
+	"github.com/labstack/echo/v4"
+
+	"github.com/onsonr/sonr/pkg/nebula/components/profile"
+)
+
+func Profile(c echo.Context) error {
+	return echoResponse(c, profile.View(c))
+}
diff --git a/pkg/nebula/pages/register.go b/pkg/nebula/pages/register.go
new file mode 100644
index 000000000..78b0e0a98
--- /dev/null
+++ b/pkg/nebula/pages/register.go
@@ -0,0 +1,11 @@
+package pages
+
+import (
+	"github.com/labstack/echo/v4"
+
+	"github.com/onsonr/sonr/pkg/nebula/components/register"
+)
+
+func Register(c echo.Context) error {
+	return echoResponse(c, register.Modal(c))
+}
diff --git a/pkg/nebula/pages/pages.go b/pkg/nebula/pages/utils.go
similarity index 100%
rename from pkg/nebula/pages/pages.go
rename to pkg/nebula/pages/utils.go