diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index fbc70f1..b4432d4 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -31,8 +31,8 @@ pub fn ArticleNav(article: Resource<Option<String>, ArticleView>) -> impl IntoVi
                         let article_link_ = article_link.clone();
                         let protected = article_.article.protected;
                         view! {
-                            <div role="tablist" class="tabs tabs-bordered">
-                                <A class="tab" href=article_link.clone()>"Read"</A>
+                            <div role="tablist" class="tabs tabs-lifted">
+                                <A class="tab tab-active" href=article_link.clone()>"Read"</A>
                                 <A class="tab" href=format!("{article_link}/history")>"History"</A>
                                 <Show when=move || {
                                     global_state
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index fab9128..8fdb04e 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -22,7 +22,7 @@ pub fn Nav() -> impl IntoView {
 
     let (search_query, set_search_query) = create_signal(String::new());
     view! {
-        <nav class="menu menu-vertical" style="min-width: 250px;">
+        <nav class="menu lg:menu-vertical lg:w-40">
             <li>
                 <A href="/">"Main Page"</A>
             </li>
@@ -38,7 +38,9 @@ pub fn Nav() -> impl IntoView {
                 </li>
             </Show>
             <li>
-                <form on:submit=move |ev| {
+                <form 
+                class="form-control m-0 p-1"
+                on:submit=move |ev| {
                     ev.prevent_default();
                     let navigate = leptos_router::use_navigate();
                     let query = search_query.get();
@@ -48,7 +50,7 @@ pub fn Nav() -> impl IntoView {
                 }>
                     <input
                         type="text"
-                        class="input"
+                        class="input input-secondary input-bordered input-xs w-full rounded"
                         placeholder="Search"
                         prop:value=search_query
                         on:keyup=move |ev: ev::KeyboardEvent| {
@@ -57,9 +59,10 @@ pub fn Nav() -> impl IntoView {
                         }
                     />
 
-                    <button class="btn btn-primary">Go</button>
+                    <button class="btn btn-xs btn-secondary">Go</button>
                 </form>
             </li>
+            <div class="divider"></div>
             <Show
                 when=move || global_state.with(|state| state.my_profile.is_some())
                 fallback=move || {
@@ -80,16 +83,15 @@ pub fn Nav() -> impl IntoView {
                     let my_profile = global_state.with(|state| state.my_profile.clone().unwrap());
                     let profile_link = format!("/user/{}", my_profile.person.username);
                     view! {
-                        <p>
+                        <p class="self-center pb-2">
                             "Logged in as "
-                            <a
+                            <a class="link"
                                 href=profile_link
-                                style="border: none; padding: 0; color: var(--accent) !important;"
                             >
                                 {my_profile.person.username}
                             </a>
                         </p>
-                        <button on:click=move |_| logout_action.dispatch(())>Logout</button>
+                        <button class="btn" on:click=move |_| logout_action.dispatch(())>Logout</button>
                     }
                 }
 
diff --git a/src/main.rs b/src/main.rs
index e7ba155..31d1ca1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -30,7 +30,10 @@ fn main() {
     mount_to_body(|| {
         view! { <App /> }
     });
+
+    // set theme
+    // https://daisyui.com/docs/themes/
     let document = web_sys::window().unwrap().document().unwrap();
     let html_element = document.document_element().unwrap();
-    html_element.set_attribute("data-theme", "cupcake").unwrap();
+    html_element.set_attribute("data-theme", "emerald").unwrap();
 }
diff --git a/tailwind.config.js b/tailwind.config.js
index a073145..6a04ef0 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -12,7 +12,7 @@ module.exports = {
     require('@tailwindcss/typography')
   ],
   daisyui: {
-    themes: ["cupcake"],
+    themes: ["emerald"],
   },
   darkMode: 'class'
 }