diff --git a/src/pages/login.rs b/src/pages/login.rs
index 1f5662e..bbb4823 100644
--- a/src/pages/login.rs
+++ b/src/pages/login.rs
@@ -1,7 +1,7 @@
-use leptos::ev;
 use leptos::leptos_dom::*;
 use leptos::*;
-use leptos_router::*;
+use leptos_icons::IoIcon::*;
+use leptos_icons::*;
 
 #[component]
 pub fn Login() -> impl IntoView {
@@ -11,9 +11,10 @@ pub fn Login() -> impl IntoView {
     view! {
         <div class="page-container">
             <div class="login-container">
-            <div class="header">
-                <h1>LibreTunes</h1>
-            </div>
+                <a class="return" href="/"><Icon icon=Icon::from(IoReturnUpBackSharp) /></a>
+                <div class="header">
+                    <h1>LibreTunes</h1>
+                </div>
                 <form class="login-form" action="POST">
                     <div class="input-box">
                         <input class="login-info" type="text" required
@@ -36,11 +37,11 @@ pub fn Login() -> impl IntoView {
                         <span>Password</span>
                         <i></i>
                     </div>
-                    <p class="forgot-pw">Forgot Password?</p>
+                    <a href="" class="forgot-pw">Forgot Password?</a>
                     <input type="submit" value="Login" />
-                    <p class="go-to-signup">
-                        New here? <span>Create an Account</span>
-                    </p>
+                    <span class="go-to-signup">
+                        New here? <a href="/signup">Create an Account</a>
+                    </span>
                 </form>
             </div>
         </div>
diff --git a/src/pages/signup.rs b/src/pages/signup.rs
index 3f04544..0ac67ae 100644
--- a/src/pages/signup.rs
+++ b/src/pages/signup.rs
@@ -3,10 +3,13 @@ use leptos::*;
 
 #[component]
 pub fn Signup() -> impl IntoView {
+    let (username, set_username) = create_signal("".to_string());
+    let (email, set_email) = create_signal("".to_string());
+    let (password, set_password) = create_signal("".to_string());
+
     view!{
         <div class="page-container">
             <div class="signup-container">
-                <h1>"Signup"</h1>
                 
             </div>
         </div>
diff --git a/style/login.scss b/style/login.scss
index e01be7c..475a1ad 100644
--- a/style/login.scss
+++ b/style/login.scss
@@ -56,7 +56,7 @@
   padding: 15px 0px 10px;
   pointer-events: none;
   color: #907163;
-  font-size: 1.2em;
+  font-size: 1.19em;
   letter-spacing: 0.5px;
   transition: 0.5s;
 }
@@ -87,6 +87,7 @@
 .login-form .forgot-pw {
   display: inline-flex;
   margin-top: 3px;
+  font-size: .9rem;
   cursor: pointer;
   color: #8f8f8f;
   text-decoration: underline;
@@ -96,7 +97,7 @@
   transition: all 0.2s;
 }
 .login-form input[type="submit"] {
-  margin-top: 2.8rem;
+  margin-top: 3rem;
   width: 100%;
   height: 3rem;
   border: none;
@@ -108,28 +109,31 @@
   background-color: #582b17;
 }
 .login-form .go-to-signup {
-  margin-top: 11px;
   color: #8f8f8f;
+  font-size: .9rem;
 }
-.login-form .go-to-signup span {
+.login-form .go-to-signup a {
   cursor: pointer;
   color: #8f8f8f;
   text-decoration: underline;
 }
-.login-form .go-to-signup span:hover {
+.login-form .go-to-signup a:hover {
   color: #fff;
   transition: all 0.2s;
 }
 .login-container .return {
   position: absolute;
-  left: 15px;
-  top: 15px;
+  left: 10px;
+  top: 10px;
   font-size: 1.8rem;
   color: white;
   cursor: pointer;
-  width: 50px;
   transition: all 0.3s;
   border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: .3rem;
 }
 .login-container .return:hover {
   background-color: rgba(0, 0, 0, 0.4);