3 files changed, 36 insertions, 24 deletions
diff --git a/site/home.lisp b/site/home.lisp
index ebc644b..5efb5c8 100644
--- a/site/home.lisp
+++ b/site/home.lisp
@@ -5,18 +5,18 @@
   :get :route ""
   :returns "text/html"
   :handle
-  (page
-   "V A M P I R E"
-   (<div>
-    ($vcenter
-     (<div> (<h3> "hey " (user-name user))
-	    (<form> (@ :method "POST" :action (wknd:route-to 'destroy.session))
-		    (<button> (@ :type "submit") "Logout"))))
-    (<div>
-     (<form> (@ :method "POST" :action (wknd:route-to 'create.invite))
-	     (<p> "Initiate an invitation...")
-	     (<button> (@ :type "submit") "Bite Someone")))
-    (<h2> "Outstanding inBites:")
-    (apply #'<ul>
-	   (mapcar (lambda (i) (<li> (key i)))
-		   (invites-by-maker (user-with-name "alucard")))))))
+  (page "V A M P I R E"
+    (<div> ($ :width "100%")
+     (<navbar>)
+     (<div> ($ :height "70%" )
+      (<h3> "hey " (user-name user))
+      (<form> (@ :method "POST" :action (wknd:route-to 'create.invite))
+	      (<p> "Initiate an invitation...")
+	      (<submit> "Bite Someone"))
+      (<h2> "Outstanding inBites:")
+      (<invite-list> user)))))
+
+(defun <invite-list> (user)
+  (apply #'<ul>
+	 (mapcar (lambda (i) (<li> (key i)))
+		 (invites-by-maker user))))
diff --git a/site/html.lisp b/site/html.lisp
index 4fdecd3..eb7bf95 100644
--- a/site/html.lisp
+++ b/site/html.lisp
@@ -10,7 +10,18 @@
        (<meta> (@ :charset "UTF-8"))
        (<meta> (@ :name "viewport" :content "width=device-width, initial-scale=1.0")))
       (<body>
-       ($center
-	(<div> (@ :class "container") (apply 'eval body)))))
+       (<div> ($ :width "777px" :height "899px" :margin "auto"
+		 :display "flex" :justify-content "center")
+	      (apply 'eval body))))
      str)))
 
+(defun <navbar> ()
+  (<div>
+   ($ :height "100px" :width "100%" :display "flex" :justify-content "space-between")
+   "MENU"
+   (<linkto> "V A M P I R E" (wknd:route-to 'home.html))
+   (<logout>)))
+
+(defun <logout> ()
+  (<form> (@ :method "POST" :action (wknd:route-to 'destroy.session)) (<submit> "Logout")))
+
diff --git a/site/login.lisp b/site/login.lisp
index 6a6c8aa..cd8edd3 100644
--- a/site/login.lisp
+++ b/site/login.lisp
@@ -8,12 +8,13 @@
 (defun login-page ()
   (page
    "V A M P I R E ~ LOGIN"
-   (<div> (@ :class "title")
+   (<div> 
     (<h1> "I vant to suck your blood")
-     (<form> (@ :method "POST" :action (wknd:route-to 'create.session))
-      (<input> (@ :placeholder "Name" :name "name"))
-      (<input> (@ :placeholder "Password" :type "password" :name "password"))
-      (<button> (@ :type "submit") "Click to Login"))
+    (<form>
+     (@ :method "POST" :action (wknd:route-to 'create.session))
+     (<input> (@ :placeholder "Name" :name "name"))
+     (<password>)
+     (<submit> "Click to Login"))
     ($center 
-     (<a> (@ :href (wknd:route-to 'new-account.html))
-	  "Hath thou been bitten? Click here to become one of us...")))))
+     (<linkto> "Hath thou been bitten? Click here to become one of us..."
+	       (wknd:route-to 'new-account.html))))))