diff --git a/assets/view/layout/base.templ b/assets/view/layout/base.templ
index 3c4fc47..d51319e 100644
--- a/assets/view/layout/base.templ
+++ b/assets/view/layout/base.templ
@@ -28,7 +28,6 @@ templ Base() {
 			<script src={ theme } defer></script>
 			<script src={ bundle } defer></script>
 			<script src={ localStorage } defer></script>
-			<script src={ htmx } defer></script>
 			<link rel="icon" type="image/x-icon" href="/static/icons/favicon.ico"/>
 			if plausible != "" {
 				@PlausibleScript(plausible)
@@ -39,7 +38,7 @@ templ Base() {
 			<main class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
 				{ children... }
 			</main>
-				@Footer()
+			@Footer()
 		</body>
 	</html>
 }
diff --git a/assets/view/layout/footer.templ b/assets/view/layout/footer.templ
index c923b9f..296f667 100644
--- a/assets/view/layout/footer.templ
+++ b/assets/view/layout/footer.templ
@@ -35,7 +35,7 @@ templ Footer() {
 			</div>
 			<div x-data>
 				<p class="mt-8 text-center text-base text-gray-400">
-					&copy;<span x-text=" new Date().getFullYear() " ></span> { appName }, All rights reserved.
+					&copy;<span x-text=" new Date().getFullYear() "></span> { appName }, All rights reserved.
 				</p>
 			</div>
 		</div>
diff --git a/assets/view/pages/home.templ b/assets/view/pages/home.templ
index 4d9eba7..7bb5b17 100644
--- a/assets/view/pages/home.templ
+++ b/assets/view/pages/home.templ
@@ -5,7 +5,9 @@ import (
 	"github.com/danielmichaels/shortlink-go/internal/config"
 )
 
-var title = config.AppConfig().Names.AppName
+var (
+	title  = config.AppConfig().Names.AppName
+)
 
 templ Home() {
 	@layout.Base() {
@@ -217,9 +219,8 @@ templ LinksSection() {
 
 templ SubmitFormScript() {
 	<script>
-	// todo: remove and use HTMX
-      const FORM_URL = "{{ .AppUrl }}/v1/links"
       function shortenForm() {
+          const formURL = window.location.origin
           return {
               formData: {
                   link: ""
@@ -234,7 +235,7 @@ templ SubmitFormScript() {
                   this.formLoading = false;
                   this.buttonText = "Submitting..."
                   this.formError = false
-                  fetch(FORM_URL, {
+                  fetch(formURL + "/v1/links", {
                       method: "POST",
                       headers: {
                           "Content-Type": "application/json",
@@ -249,7 +250,7 @@ templ SubmitFormScript() {
                       throw new Error("error")
                   })
                   .then((resp) => {
-                      console.log(resp)
+                      console.debug(resp)
                       this.formData.link = "";
                       this.formMessage = "Link successfully saved"
                       appendLocalStorageHashes(resp)