diff --git a/src/main.rs b/src/main.rs
index c5d7795..9b6665d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,8 @@
 mod topbar;
 
+use topbar::TopBar;
 use yew::prelude::*;
 use yew_router::prelude::*;
-use topbar::TopBar;
 
 #[derive(Clone, Routable, PartialEq)]
 enum Route {
diff --git a/src/topbar.rs b/src/topbar.rs
index 7ee875d..e701129 100644
--- a/src/topbar.rs
+++ b/src/topbar.rs
@@ -1,43 +1,84 @@
 use yew::prelude::*;
 
+pub enum Msg {
+    ToggleSignIn,
+    ToggleSignUp,
+}
+
 #[derive(Properties, PartialEq)]
 pub struct TabProps {
     pub text: AttrValue,
-    pub link: AttrValue,
 }
 
 #[function_component]
-pub fn Tab(props: &TabProps) -> Html {
-    html!{
-        <li><a href={props.link.clone()}>
-            <svg width="136" height="54" viewBox="-0.5 -0.5 136 54" xmlns="http://www.w3.org/2000/svg">
-                <g>
-                    <path d="m 123.5,11.5 5,5 c 3.33333,3.333333 5,8.333333 5,15 v 10 c 0,6.666667 -3.33333,10 -10,10 H 11.500001 c -6.6666667,0 -10,-3.333333 -10,-10 v -30 c 0,-6.6666666 3.3333333,-9.9999996 10,-9.9999996 H 103.5 c 6.66667,0 11.66667,1.666667 15,5 z"
-                          class="tab-svg-path"/>
-                    <text x="67.010414" y="31.911449">
-                        <tspan class="tab-svg-text">{props.text.clone()}</tspan>
-                    </text>
-                </g>
-            </svg>
-        </a></li>
+fn Tab(props: &TabProps) -> Html {
+    html! {
+        <svg width="136" height="54" viewBox="-0.5 -0.5 136 54" xmlns="http://www.w3.org/2000/svg">
+            <g>
+                <path d="m 123.5,11.5 5,5 c 3.33333,3.333333 5,8.333333 5,15 v 10 c 0,6.666667 -3.33333,10 -10,10 H 11.500001 c -6.6666667,0 -10,-3.333333 -10,-10 v -30 c 0,-6.6666666 3.3333333,-9.9999996 10,-9.9999996 H 103.5 c 6.66667,0 11.66667,1.666667 15,5 z"
+                      class="tab-svg-path"/>
+                <text x="67.010414" y="31.911449">
+                    <tspan class="tab-svg-text">{props.text.clone()}</tspan>
+                </text>
+            </g>
+        </svg>
     }
 }
 
-#[function_component]
-pub fn TopBar() -> Html {
-    html!{
-        <nav id="topbar">
-            <ul id="tabs-main" class="tabs">
-                <Tab text="Home" link="/" />
-                <Tab text="Services" link="/services" />
-                <Tab text="Community" link="/community" />
-                <Tab text="About" link="/about" />
-            </ul>
+pub struct TopBar {
+    sign_in: bool,
+    sign_up: bool,
+}
 
-            <ul id="tabs-account" class="tabs">
-                <Tab text="Sign In" link="/#signin" />
-                <Tab text="Sign Up" link="/#signup" />
-            </ul>
-        </nav>
+impl Component for TopBar {
+    type Message = Msg;
+    type Properties = ();
+
+    fn create(_ctx: &Context<Self>) -> Self {
+        Self {
+            sign_in: false,
+            sign_up: false,
+        }
     }
-}
\ No newline at end of file
+
+    fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
+        match msg {
+            Msg::ToggleSignIn => {
+                self.sign_up = false;
+                self.sign_in = !self.sign_in;
+                true
+            }
+            Msg::ToggleSignUp => {
+                self.sign_in = false;
+                self.sign_up = !self.sign_up;
+                true
+            }
+        }
+    }
+
+    fn view(&self, ctx: &Context<Self>) -> Html {
+        html! {
+            <nav id="topbar">
+                <ul id="tabs-main" class="tabs">
+                    <li><a href="/"><Tab text="Home" /></a></li>
+                    <li><a href="/services"><Tab text="Services" /></a></li>
+                    <li><a href="/community"><Tab text="Community" /></a></li>
+                    <li><a href="/about"><Tab text="About" /></a></li>
+                </ul>
+
+                <ul id="tabs-account" class="tabs">
+                    <li><button onclick={ctx.link().callback(|_| Msg::ToggleSignIn)}><Tab text="Sign In" /></button></li>
+                    <li><button onclick={ctx.link().callback(|_| Msg::ToggleSignUp)}><Tab text="Sign Up" /></button></li>
+                </ul>
+
+                if self.sign_in {
+                    <h1>{"Sign In"}</h1>
+                }
+
+                if self.sign_up {
+                    <h1>{"Sign Up"}</h1>
+                }
+            </nav>
+        }
+    }
+}
diff --git a/style/home.css b/style/home.css
index 06b98aa..6068c18 100644
--- a/style/home.css
+++ b/style/home.css
@@ -15,7 +15,7 @@ main {
 }
 
 .content {
-    margin: 12px;
+    padding: 12px;
     height: calc(100% - 48px);
     width: calc(100% - 24px);
 }
diff --git a/style/topbar.css b/style/topbar.css
index f48301b..551fa19 100644
--- a/style/topbar.css
+++ b/style/topbar.css
@@ -1,10 +1,17 @@
 .tabs li {
     display: inline-block;
-    padding-left: 8px;
+    padding-right: 8px;
 }
 
 .tabs li a {
     position: relative;
+    cursor: default;
+}
+
+.tabs li button {
+    position: relative;
+    border: none;
+    background: none;
 }
 
 .tab-svg-path {