diff --git a/.leptosfmt.toml b/.leptosfmt.toml
new file mode 100644
index 0000000..ac5be1f
--- /dev/null
+++ b/.leptosfmt.toml
@@ -0,0 +1,2 @@
+max_width = 100
+attr_value_brace_style = "WhenRequired" # "Always", "AlwaysUnlessLit", "WhenRequired" or "Preserve"
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 8f6a6ce..94b4541 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,5 +1,6 @@
 variables:
   - &rust_image "rust:1.75"
+  - &install_binstall "wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz && tar -xvf cargo-binstall-x86_64-unknown-linux-musl.tgz && cp cargo-binstall /usr/local/cargo/bin"
 
 steps:
   cargo_fmt:
@@ -10,6 +11,20 @@ steps:
     commands:
       - rustup component add rustfmt
       - cargo +nightly fmt -- --check
+
+  leptos_fmt:
+    image: *rust_image
+    commands:
+      - *install_binstall
+      - cargo binstall -y leptosfmt
+      - leptosfmt -c .leptosfmt.toml --check src
+    when:
+      - event: pull_request
+
+  toml_fmt:
+    image: tamasfe/taplo:0.8.1
+    commands:
+      - taplo format --check
     when:
       - event: pull_request
 
diff --git a/Cargo.lock b/Cargo.lock
index 345e825..0841931 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1587,7 +1587,7 @@ dependencies = [
 
 [[package]]
 name = "ibis"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "activitypub_federation",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index eaeaf7f..29cb1e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ diesel = { version = "2.1.4", features = [
   "postgres",
   "chrono",
   "uuid",
-  "r2d2"
+  "r2d2",
 ], optional = true }
 diesel-derive-newtype = { version = "2.1.0", optional = true }
 diesel_migrations = { version = "2.1.0", optional = true }
@@ -97,5 +97,5 @@ debug = 0
 
 [profile.release]
 lto = "thin"
-strip = true    # Automatically strip symbols from the binary.
+strip = true # Automatically strip symbols from the binary.
 #opt-level = "z" # Optimize for size.
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index 862ded0..362cf66 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -88,7 +88,7 @@ pub async fn start(config: IbisConfig) -> MyResult<()> {
 
     let config = data.clone();
     let app = Router::new()
-        .leptos_routes(&leptos_options, routes, || view! {  <App/> })
+        .leptos_routes(&leptos_options, routes, || view! { <App/> })
         .with_state(leptos_options)
         .nest("", asset_routes()?)
         .nest(FEDERATION_ROUTES_PREFIX, federation_routes())
diff --git a/src/frontend/app.rs b/src/frontend/app.rs
index e172534..0df1bfb 100644
--- a/src/frontend/app.rs
+++ b/src/frontend/app.rs
@@ -90,30 +90,30 @@ pub fn App() -> impl IntoView {
     provide_context(create_rw_signal(global_state));
 
     view! {
-        <>
-            <Stylesheet id="simple" href="/assets/simple.css"/>
-            <Stylesheet id="ibis" href="/assets/ibis.css"/>
-            <Router>
-                <Nav />
-                <main>
-                    <Routes>
-                        <Route path="/" view=ReadArticle/>
-                        <Route path="/article/:title" view=ReadArticle/>
-                        <Route path="/article/:title/history" view=ArticleHistory/>
-                        <Route path="/article/:title/edit/:conflict_id?" view=EditArticle/>
-                        <Route path="/article/:title/actions" view=ArticleActions/>
-                        <Route path="/article/:title/diff/:hash" view=EditDiff/>
-                        <Route path="/article/create" view=CreateArticle/>
-                        <Route path="/article/list" view=ListArticles/>
-                        <Route path="/instance/:hostname" view=InstanceDetails/>
-                        <Route path="/user/:name" view=UserProfile/>
-                        <Route path="/login" view=Login/>
-                        <Route path="/register" view=Register/>
-                        <Route path="/search" view=Search/>
-                        <Route path="/conflicts" view=Conflicts/>
-                    </Routes>
-                </main>
-            </Router>
-        </>
+      <>
+        <Stylesheet id="simple" href="/assets/simple.css"/>
+        <Stylesheet id="ibis" href="/assets/ibis.css"/>
+        <Router>
+          <Nav/>
+          <main>
+            <Routes>
+              <Route path="/" view=ReadArticle/>
+              <Route path="/article/:title" view=ReadArticle/>
+              <Route path="/article/:title/history" view=ArticleHistory/>
+              <Route path="/article/:title/edit/:conflict_id?" view=EditArticle/>
+              <Route path="/article/:title/actions" view=ArticleActions/>
+              <Route path="/article/:title/diff/:hash" view=EditDiff/>
+              <Route path="/article/create" view=CreateArticle/>
+              <Route path="/article/list" view=ListArticles/>
+              <Route path="/instance/:hostname" view=InstanceDetails/>
+              <Route path="/user/:name" view=UserProfile/>
+              <Route path="/login" view=Login/>
+              <Route path="/register" view=Register/>
+              <Route path="/search" view=Search/>
+              <Route path="/conflicts" view=Conflicts/>
+            </Routes>
+          </main>
+        </Router>
+      </>
     }
 }
diff --git a/src/frontend/components/article_nav.rs b/src/frontend/components/article_nav.rs
index 7a261af..4afdbee 100644
--- a/src/frontend/components/article_nav.rs
+++ b/src/frontend/components/article_nav.rs
@@ -12,42 +12,61 @@ use leptos_router::*;
 #[component]
 pub fn ArticleNav(article: Resource<Option<String>, ArticleView>) -> impl IntoView {
     view! {
-        <Suspense>
-            {move || article.get().map(|article_| {
-                let instance = create_local_resource(move || article_.article.instance_id, move |instance_id| async move {
-                    let form = GetInstance {
-                        id: Some(instance_id)
-                    };
-                    GlobalState::api_client()
-                        .get_instance(&form)
-                        .await
-                        .unwrap()
-                });
-                let global_state = use_context::<RwSignal<GlobalState>>().unwrap();
-                let article_link = article_link(&article_.article);
-                let article_link_ = article_link.clone();
-                let protected = article_.article.protected;
-                view!{
-                    <nav class="inner">
+      <Suspense>
+        {move || {
+            article
+                .get()
+                .map(|article_| {
+                    let instance = create_local_resource(
+                        move || article_.article.instance_id,
+                        move |instance_id| async move {
+                            let form = GetInstance {
+                                id: Some(instance_id),
+                            };
+                            GlobalState::api_client().get_instance(&form).await.unwrap()
+                        },
+                    );
+                    let global_state = use_context::<RwSignal<GlobalState>>().unwrap();
+                    let article_link = article_link(&article_.article);
+                    let article_link_ = article_link.clone();
+                    let protected = article_.article.protected;
+                    view! {
+                      <nav class="inner">
                         <A href=article_link.clone()>"Read"</A>
-                        <A href={format!("{article_link}/history")}>"History"</A>
-                        <Show when=move || global_state.with(|state| {
-                            let is_admin = state.my_profile.as_ref().map(|p| p.local_user.admin).unwrap_or(false);
-                            state.my_profile.is_some() && can_edit_article(&article_.article, is_admin).is_ok()
-                        })>
-                            <A href={format!("{article_link}/edit")}>"Edit"</A>
+                        <A href=format!("{article_link}/history")>"History"</A>
+                        <Show when=move || {
+                            global_state
+                                .with(|state| {
+                                    let is_admin = state
+                                        .my_profile
+                                        .as_ref()
+                                        .map(|p| p.local_user.admin)
+                                        .unwrap_or(false);
+                                    state.my_profile.is_some()
+                                        && can_edit_article(&article_.article, is_admin).is_ok()
+                                })
+                        }>
+                          <A href=format!("{article_link}/edit")>"Edit"</A>
                         </Show>
                         <Show when=move || global_state.with(|state| state.my_profile.is_some())>
-                            <A href={format!("{article_link_}/actions")}>"Actions"</A>
-                            {instance.get().map(|i|
-                                view!{ <InstanceFollowButton instance=i.instance.clone() /> }
-                            )}
+                          <A href=format!("{article_link_}/actions")>"Actions"</A>
+                          {instance
+                              .get()
+                              .map(|i| {
+                                  view! { <InstanceFollowButton instance=i.instance.clone()/> }
+                              })}
+
                         </Show>
                         <Show when=move || protected>
-                            <span title="Article can only be edited by local admins">"Protected"</span>
+                          <span title="Article can only be edited by local admins">
+                            "Protected"
+                          </span>
                         </Show>
-                    </nav>
-            }})}
-        </Suspense>
+                      </nav>
+                    }
+                })
+        }}
+
+      </Suspense>
     }
 }
diff --git a/src/frontend/components/credentials.rs b/src/frontend/components/credentials.rs
index 81e0e31..8d08134 100644
--- a/src/frontend/components/credentials.rs
+++ b/src/frontend/components/credentials.rs
@@ -18,57 +18,63 @@ pub fn CredentialsForm(
     });
 
     view! {
-        <form on:submit=|ev| ev.prevent_default()>
-            <p>{title}</p>
-            {move || {
-                error
-                    .get()
-                    .map(|err| {
-                        view! { <p style="color:red;">{err}</p> }
-                    })
-            }}
-            <input
-                type="text"
-                required
-                placeholder="Username"
-                prop:disabled=move || disabled.get()
-                on:keyup=move |ev: ev::KeyboardEvent| {
-                    let val = event_target_value(&ev);
-                    set_username.update(|v| *v = val);
-                }
-                on:change=move |ev| {
-                    let val = event_target_value(&ev);
-                    set_username.update(|v| *v = val);
-                }
-            />
-            <input
-                type="password"
-                required
-                placeholder="Password"
-                prop:disabled=move || disabled.get()
-                on:keyup=move |ev: ev::KeyboardEvent| {
-                    match &*ev.key() {
-                        "Enter" => {
-                            dispatch_action();
-                        }
-                        _ => {
-                            let val = event_target_value(&ev);
-                            set_password.update(|p| *p = val);
-                        }
-                    }
-                }
-                on:change=move |ev| {
-                    let val = event_target_value(&ev);
-                    set_password.update(|p| *p = val);
-                }
-            />
-            <div>
-                <button
-                    prop:disabled=move || button_is_disabled.get()
-                    on:click=move |_| dispatch_action()>
-                    {action_label}
-                </button>
-            </div>
-        </form>
+      <form on:submit=|ev| ev.prevent_default()>
+        <p>{title}</p>
+        {move || {
+            error
+                .get()
+                .map(|err| {
+                    view! { <p style="color:red;">{err}</p> }
+                })
+        }}
+
+        <input
+          type="text"
+          required
+          placeholder="Username"
+          prop:disabled=move || disabled.get()
+          on:keyup=move |ev: ev::KeyboardEvent| {
+              let val = event_target_value(&ev);
+              set_username.update(|v| *v = val);
+          }
+
+          on:change=move |ev| {
+              let val = event_target_value(&ev);
+              set_username.update(|v| *v = val);
+          }
+        />
+
+        <input
+          type="password"
+          required
+          placeholder="Password"
+          prop:disabled=move || disabled.get()
+          on:keyup=move |ev: ev::KeyboardEvent| {
+              match &*ev.key() {
+                  "Enter" => {
+                      dispatch_action();
+                  }
+                  _ => {
+                      let val = event_target_value(&ev);
+                      set_password.update(|p| *p = val);
+                  }
+              }
+          }
+
+          on:change=move |ev| {
+              let val = event_target_value(&ev);
+              set_password.update(|p| *p = val);
+          }
+        />
+
+        <div>
+          <button
+            prop:disabled=move || button_is_disabled.get()
+            on:click=move |_| dispatch_action()
+          >
+            {action_label}
+          </button>
+        </div>
+      </form>
     }
 }
diff --git a/src/frontend/components/instance_follow_button.rs b/src/frontend/components/instance_follow_button.rs
index 7b0bd6f..22e7e66 100644
--- a/src/frontend/components/instance_follow_button.rs
+++ b/src/frontend/components/instance_follow_button.rs
@@ -30,10 +30,12 @@ pub fn InstanceFollowButton(instance: DbInstance) -> impl IntoView {
     };
 
     view! {
-        <button on:click=move |_| follow_action.dispatch(instance.id)
-                prop:disabled=move || is_following
-                prop:hidden=move || instance.local>
-            {follow_text}
-        </button>
+      <button
+        on:click=move |_| follow_action.dispatch(instance.id)
+        prop:disabled=move || is_following
+        prop:hidden=move || instance.local
+      >
+        {follow_text}
+      </button>
     }
 }
diff --git a/src/frontend/components/nav.rs b/src/frontend/components/nav.rs
index e14b25c..06a91e5 100644
--- a/src/frontend/components/nav.rs
+++ b/src/frontend/components/nav.rs
@@ -22,70 +22,77 @@ pub fn Nav() -> impl IntoView {
 
     let (search_query, set_search_query) = create_signal(String::new());
     view! {
-        <nav class="inner" style="min-width: 250px;">
-            <li>
-                <A href="/">"Main Page"</A>
-            </li>
-            <li>
-                <A href="/article/list">"List Articles"</A>
-            </li>
-            <Show
-                when=move || global_state.with(|state| state.my_profile.is_some())>
+      <nav class="inner" style="min-width: 250px;">
+        <li>
+          <A href="/">"Main Page"</A>
+        </li>
+        <li>
+          <A href="/article/list">"List Articles"</A>
+        </li>
+        <Show when=move || global_state.with(|state| state.my_profile.is_some())>
+          <li>
+            <A href="/article/create">"Create Article"</A>
+          </li>
+          <li>
+            <A href="/conflicts">"Edit Conflicts"</A>
+          </li>
+        </Show>
+        <li>
+          <form on:submit=move |ev| {
+              ev.prevent_default();
+              let navigate = leptos_router::use_navigate();
+              let query = search_query.get();
+              if !query.is_empty() {
+                  navigate(&format!("/search?query={query}"), Default::default());
+              }
+          }>
+            <input
+              type="text"
+              placeholder="Search"
+              prop:value=search_query
+              on:keyup=move |ev: ev::KeyboardEvent| {
+                  let val = event_target_value(&ev);
+                  set_search_query.update(|v| *v = val);
+              }
+            />
+
+            <button>Go</button>
+          </form>
+        </li>
+        <Show
+          when=move || global_state.with(|state| state.my_profile.is_some())
+          fallback=move || {
+              view! {
                 <li>
-                    <A href="/article/create">"Create Article"</A>
+                  <A href="/login">"Login"</A>
                 </li>
-                <li>
-                    <A href="/conflicts">"Edit Conflicts"</A>
-                </li>
-            </Show>
-            <li>
-                <form on:submit=move |ev| {
-                    ev.prevent_default();
-                    let navigate = leptos_router::use_navigate();
-                    let query = search_query.get();
-                    if !query.is_empty() {
-                        navigate(&format!("/search?query={query}"), Default::default());
-                    }
-                }>
-                    <input type="text" placeholder="Search"
-                        prop:value=search_query
-                        on:keyup=move |ev: ev::KeyboardEvent| {
-                            let val = event_target_value(&ev);
-                            set_search_query.update(|v| *v = val);
-                        } />
-                    <button>Go</button>
-                </form>
-            </li>
-            <Show
-                when=move || global_state.with(|state| state.my_profile.is_some())
-                fallback=move ||  {
-                    view! {
-                        <li>
-                            <A href="/login">"Login"</A>
-                        </li>
-                        <Show when=move || registration_open.get().unwrap_or_default()>
-                            <li>
-                                <A href="/register">"Register"</A>
-                            </li>
-                        </Show>
-                    }
-                }
-            >
-                {
-                    let my_profile = global_state.with(|state| state.my_profile.clone().unwrap());
-                    let profile_link = format!("/user/{}", my_profile.person.username);
-                    view ! {
-                        <p>"Logged in as "
-                            <a 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>
-                    }
-                }
-            </Show>
-        </nav>
+                <Show when=move || registration_open.get().unwrap_or_default()>
+                  <li>
+                    <A href="/register">"Register"</A>
+                  </li>
+                </Show>
+              }
+          }
+        >
+
+          {
+              let my_profile = global_state.with(|state| state.my_profile.clone().unwrap());
+              let profile_link = format!("/user/{}", my_profile.person.username);
+              view! {
+                <p>
+                  "Logged in as "
+                  <a
+                    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>
+              }
+          }
+
+        </Show>
+      </nav>
     }
 }
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs
index 79f601b..f8697f1 100644
--- a/src/frontend/mod.rs
+++ b/src/frontend/mod.rs
@@ -43,7 +43,5 @@ fn user_title(person: &DbPerson) -> String {
 
 fn user_link(person: &DbPerson) -> impl IntoView {
     let creator_path = format!("/user/{}", person.username);
-    view! {
-        <a href={creator_path}>{user_title(person)}</a>
-    }
+    view! { <a href=creator_path>{user_title(person)}</a> }
 }
diff --git a/src/frontend/pages/article/actions.rs b/src/frontend/pages/article/actions.rs
index dad534c..50636f5 100644
--- a/src/frontend/pages/article/actions.rs
+++ b/src/frontend/pages/article/actions.rs
@@ -52,50 +52,73 @@ pub fn ArticleActions() -> impl IntoView {
         }
     });
     view! {
-        <ArticleNav article=article/>
-        <Suspense fallback=|| view! {  "Loading..." }> {
-            move || article.get().map(|article|
-            view! {
-                <div class="item-view">
-                    <h1>{article_title(&article.article)}</h1>
-                    {move || {
-                        error
-                            .get()
-                            .map(|err| {
-                                view! { <p style="color:red;">{err}</p> }
-                            })
-                    }}
-                    <Show
-                        when=move || global_state.with(|state| {
-                            state.my_profile.as_ref().map(|p| p.local_user.admin).unwrap_or_default()
-                                && article.article.local
-                        })>
-                        <button
-                            on:click=move |_| protect_action.dispatch((article.article.id, article.article.protected))>Toggle Article Protection</button>
-                        <p>"Protect a local article so that only admins can edit it"</p>
-                    </Show>
-                    <Show when=move || !article.article.local>
-                        <input
+      <ArticleNav article=article/>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+        {move || {
+            article
+                .get()
+                .map(|article| {
+                    view! {
+                      <div class="item-view">
+                        <h1>{article_title(&article.article)}</h1>
+                        {move || {
+                            error
+                                .get()
+                                .map(|err| {
+                                    view! { <p style="color:red;">{err}</p> }
+                                })
+                        }}
+
+                        <Show when=move || {
+                            global_state
+                                .with(|state| {
+                                    state
+                                        .my_profile
+                                        .as_ref()
+                                        .map(|p| p.local_user.admin)
+                                        .unwrap_or_default() && article.article.local
+                                })
+                        }>
+                          <button on:click=move |_| {
+                              protect_action
+                                  .dispatch((article.article.id, article.article.protected))
+                          }>Toggle Article Protection</button>
+                          <p>"Protect a local article so that only admins can edit it"</p>
+                        </Show>
+                        <Show when=move || !article.article.local>
+                          <input
                             placeholder="New Title"
                             on:keyup=move |ev: ev::KeyboardEvent| {
                                 let val = event_target_value(&ev);
                                 set_new_title.update(|v| *v = val);
-                        } />
-                        <button
+                            }
+                          />
+
+                          <button
                             disabled=move || new_title.get().is_empty()
-                            on:click=move |_| fork_action.dispatch((article.article.id, new_title.get()))>Fork Article</button>
-                        <p>
+                            on:click=move |_| {
+                                fork_action.dispatch((article.article.id, new_title.get()))
+                            }
+                          >
+
+                            Fork Article
+                          </button>
+                          <p>
                             "You can fork a remote article to the local instance. This is useful if the original
                             instance is dead, or if there are disagreements how the article should be written."
-                        </p>
-                    </Show>
-                </div>
-            })
-        }
-        </Suspense>
-        <Show when=move || fork_response.get().is_some()>
-            <Redirect path={article_link(&fork_response.get().unwrap())}/>
-        </Show>
-        <p>"TODO: add option for admin to delete article etc"</p>
+                          </p>
+                        </Show>
+                      </div>
+                    }
+                })
+        }}
+
+      </Suspense>
+      <Show when=move || fork_response.get().is_some()>
+        <Redirect path=article_link(&fork_response.get().unwrap())/>
+      </Show>
+      <p>"TODO: add option for admin to delete article etc"</p>
     }
 }
diff --git a/src/frontend/pages/article/create.rs b/src/frontend/pages/article/create.rs
index d2d174a..201fb05 100644
--- a/src/frontend/pages/article/create.rs
+++ b/src/frontend/pages/article/create.rs
@@ -40,50 +40,66 @@ pub fn CreateArticle() -> impl IntoView {
     });
 
     view! {
-        <h1>Create new Article</h1>
-        <Show
-            when=move || create_response.get().is_some()
-            fallback=move || {
-                view! {
-                    <div class="item-view">
-                        <input
-                            type="text"
-                            required
-                            placeholder="Title"
-                            prop:disabled=move || wait_for_response.get()
-                            on:keyup=move |ev| {
-                                let val = event_target_value(&ev);
-                                set_title.update(|v| *v = val);
-                            }
-                        />
-                        <textarea placeholder="Article text..." on:keyup=move |ev| {
-                            let val = event_target_value(&ev);
-                            set_text.update(|p| *p = val);
-                        } >
-                        </textarea>
-                        <div><a href="https://commonmark.org/help/" target="blank_">Markdown</a>" formatting is supported"</div>
-                        {move || {
-                            create_error
-                                .get()
-                                .map(|err| {
-                                    view! { <p style="color:red;">{err}</p> }
-                                })
-                        }}
-                        <input type="text"
-                            placeholder="Edit summary"
-                            on:keyup=move |ev| {
-                                let val = event_target_value(&ev);
-                                set_summary.update(|p| *p = val);
-                        }/>
-                        <button
-                            prop:disabled=move || button_is_disabled.get()
-                            on:click=move |_| submit_action.dispatch((title.get(), text.get(), summary.get()))>
-                            Submit
-                        </button>
-                    </div>
-                }
-            }>
-            <Redirect path={format!("/article/{}", title.get().replace(' ', "_"))} />
-        </Show>
+      <h1>Create new Article</h1>
+      <Show
+        when=move || create_response.get().is_some()
+        fallback=move || {
+            view! {
+              <div class="item-view">
+                <input
+                  type="text"
+                  required
+                  placeholder="Title"
+                  prop:disabled=move || wait_for_response.get()
+                  on:keyup=move |ev| {
+                      let val = event_target_value(&ev);
+                      set_title.update(|v| *v = val);
+                  }
+                />
+
+                <textarea
+                  placeholder="Article text..."
+                  on:keyup=move |ev| {
+                      let val = event_target_value(&ev);
+                      set_text.update(|p| *p = val);
+                  }
+                >
+                </textarea>
+                <div>
+                  <a href="https://commonmark.org/help/" target="blank_">
+                    Markdown
+                  </a>
+                  " formatting is supported"
+                </div>
+                {move || {
+                    create_error
+                        .get()
+                        .map(|err| {
+                            view! { <p style="color:red;">{err}</p> }
+                        })
+                }}
+
+                <input
+                  type="text"
+                  placeholder="Edit summary"
+                  on:keyup=move |ev| {
+                      let val = event_target_value(&ev);
+                      set_summary.update(|p| *p = val);
+                  }
+                />
+
+                <button
+                  prop:disabled=move || button_is_disabled.get()
+                  on:click=move |_| submit_action.dispatch((title.get(), text.get(), summary.get()))
+                >
+                  Submit
+                </button>
+              </div>
+            }
+        }
+      >
+
+        <Redirect path=format!("/article/{}", title.get().replace(' ', "_"))/>
+      </Show>
     }
 }
diff --git a/src/frontend/pages/article/edit.rs b/src/frontend/pages/article/edit.rs
index 5141067..19923cc 100644
--- a/src/frontend/pages/article/edit.rs
+++ b/src/frontend/pages/article/edit.rs
@@ -100,56 +100,82 @@ pub fn EditArticle() -> impl IntoView {
     );
 
     view! {
-        <ArticleNav article=article/>
-        <Show
-            when=move || edit_response.get() == EditResponse::Success
-            fallback=move || {
-                view! {
-                    <Suspense fallback=|| view! {  "Loading..." }> {
-                        move || article.get().map(|mut article| {
+      <ArticleNav article=article/>
+      <Show
+        when=move || edit_response.get() == EditResponse::Success
+        fallback=move || {
+            view! {
+              <Suspense fallback=|| {
+                  view! { "Loading..." }
+              }>
+                {move || {
+                    article
+                        .get()
+                        .map(|mut article| {
                             if let EditResponse::Conflict(conflict) = edit_response.get() {
                                 article.article.text = conflict.three_way_merge;
                                 set_summary.set(conflict.summary);
                             }
-                            // set initial text, otherwise submit with no changes results in empty text
                             set_text.set(article.article.text.clone());
                             let article_ = article.clone();
                             view! {
-                                <div class="item-view">
-                                    <h1>{article_title(&article.article)}</h1>
-                                    {move || {
-                                        edit_error
-                                            .get()
-                                            .map(|err| {
-                                                view! { <p style="color:red;">{err}</p> }
-                                            })
-                                    }}
-                                    <textarea on:keyup=move |ev| {
-                                        let val = event_target_value(&ev);
-                                        set_text.update(|p| *p = val);
-                                    }>
-                                        {article.article.text.clone()}
-                                    </textarea>
-                                    <div><a href="https://commonmark.org/help/" target="blank_">Markdown</a>" formatting is supported"</div>
-                                    <input type="text"
-                                        placeholder="Edit summary"
-                                        value={summary.get_untracked()}
-                                        on:keyup=move |ev| {
-                                            let val = event_target_value(&ev);
-                                            set_summary.update(|p| *p = val);
-                                    }/>
-                                    <button
-                                        prop:disabled=move || button_is_disabled.get()
-                                        on:click=move |_| submit_action.dispatch((text.get(), summary.get(), article_.clone(), edit_response.get()))>
-                                        Submit
-                                    </button>
+                              // set initial text, otherwise submit with no changes results in empty text
+                              <div class="item-view">
+                                <h1>{article_title(&article.article)}</h1>
+                                {move || {
+                                    edit_error
+                                        .get()
+                                        .map(|err| {
+                                            view! { <p style="color:red;">{err}</p> }
+                                        })
+                                }}
+
+                                <textarea on:keyup=move |ev| {
+                                    let val = event_target_value(&ev);
+                                    set_text.update(|p| *p = val);
+                                }>{article.article.text.clone()}</textarea>
+                                <div>
+                                  <a href="https://commonmark.org/help/" target="blank_">
+                                    Markdown
+                                  </a>
+                                  " formatting is supported"
                                 </div>
+                                <input
+                                  type="text"
+                                  placeholder="Edit summary"
+                                  value=summary.get_untracked()
+                                  on:keyup=move |ev| {
+                                      let val = event_target_value(&ev);
+                                      set_summary.update(|p| *p = val);
+                                  }
+                                />
+
+                                <button
+                                  prop:disabled=move || button_is_disabled.get()
+                                  on:click=move |_| {
+                                      submit_action
+                                          .dispatch((
+                                              text.get(),
+                                              summary.get(),
+                                              article_.clone(),
+                                              edit_response.get(),
+                                          ))
+                                  }
+                                >
+
+                                  Submit
+                                </button>
+                              </div>
                             }
                         })
-                    }
-                    </Suspense>
-                }}>
-            Edit successful!
-        </Show>
+                }}
+
+              </Suspense>
+            }
+        }
+      >
+
+        Edit successful!
+      </Show>
     }
 }
diff --git a/src/frontend/pages/article/history.rs b/src/frontend/pages/article/history.rs
index 30cc90c..0bb3d86 100644
--- a/src/frontend/pages/article/history.rs
+++ b/src/frontend/pages/article/history.rs
@@ -12,23 +12,49 @@ pub fn ArticleHistory() -> impl IntoView {
     let article = article_resource();
 
     view! {
-        <ArticleNav article=article/>
-        <Suspense fallback=|| view! {  "Loading..." }> {
-            move || article.get().map(|article| {
-                view! {
-                    <div class="item-view">
+      <ArticleNav article=article/>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+        {move || {
+            article
+                .get()
+                .map(|article| {
+                    view! {
+                      <div class="item-view">
                         <h1>{article_title(&article.article)}</h1>
-                        {
-                            article.edits.into_iter().rev().map(|edit| {
-                                let path = format!("/article/{}@{}/diff/{}", article.article.title, extract_domain(&article.article.ap_id), edit.edit.hash.0);
-                                let label = format!("{} ({})", edit.edit.summary, edit.edit.created.to_rfc2822());
-                                view! {<li><a href={path}>{label}</a>" by "{user_link(&edit.creator)}</li> }
-                            }).collect::<Vec<_>>()
-                        }
-                    </div>
-                }
-            })
-        }
-        </Suspense>
+
+                        {article
+                            .edits
+                            .into_iter()
+                            .rev()
+                            .map(|edit| {
+                                let path = format!(
+                                    "/article/{}@{}/diff/{}",
+                                    article.article.title,
+                                    extract_domain(&article.article.ap_id),
+                                    edit.edit.hash.0,
+                                );
+                                let label = format!(
+                                    "{} ({})",
+                                    edit.edit.summary,
+                                    edit.edit.created.to_rfc2822(),
+                                );
+                                view! {
+                                  <li>
+                                    <a href=path>{label}</a>
+                                    " by "
+                                    {user_link(&edit.creator)}
+                                  </li>
+                                }
+                            })
+                            .collect::<Vec<_>>()}
+
+                      </div>
+                    }
+                })
+        }}
+
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/article/list.rs b/src/frontend/pages/article/list.rs
index 0f0b58a..6c0d036 100644
--- a/src/frontend/pages/article/list.rs
+++ b/src/frontend/pages/article/list.rs
@@ -21,28 +21,36 @@ pub fn ListArticles() -> impl IntoView {
     );
 
     view! {
-        <h1>Most recently edited Articles</h1>
-        <Suspense fallback=|| view! {  "Loading..." }>
-            <fieldset on:input=move |ev| {
-                let val = ev
-                    .target()
-                    .unwrap()
-                    .unchecked_into::<web_sys::HtmlInputElement>()
-                    .id();
-                let is_local_only = val == "only-local";
-                set_only_local.update(|p| *p = is_local_only);
-            }>
-                <input type="radio" name="listing-type" id="only-local" />
-                <label for="only-local">Only Local</label>
-                <input type="radio" name="listing-type" id="all" checked/>
-                <label for="all">All</label>
-            </fieldset>
-            <ul> {
-                move || articles.get().map(|a|
-                    a.into_iter().map(|a| view! {
-                    <li><a href=article_link(&a)>{article_title(&a)}</a></li>
-                }).collect::<Vec<_>>())
-            } </ul>
-        </Suspense>
+      <h1>Most recently edited Articles</h1>
+      <Suspense fallback=|| view! { "Loading..." }>
+        <fieldset on:input=move |ev| {
+            let val = ev.target().unwrap().unchecked_into::<web_sys::HtmlInputElement>().id();
+            let is_local_only = val == "only-local";
+            set_only_local.update(|p| *p = is_local_only);
+        }>
+          <input type="radio" name="listing-type" id="only-local"/>
+          <label for="only-local">Only Local</label>
+          <input type="radio" name="listing-type" id="all" checked/>
+          <label for="all">All</label>
+        </fieldset>
+        <ul>
+          {move || {
+              articles
+                  .get()
+                  .map(|a| {
+                      a.into_iter()
+                          .map(|a| {
+                              view! {
+                                <li>
+                                  <a href=article_link(&a)>{article_title(&a)}</a>
+                                </li>
+                              }
+                          })
+                          .collect::<Vec<_>>()
+                  })
+          }}
+
+        </ul>
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/article/read.rs b/src/frontend/pages/article/read.rs
index 98873af..d161a7b 100644
--- a/src/frontend/pages/article/read.rs
+++ b/src/frontend/pages/article/read.rs
@@ -11,17 +11,27 @@ pub fn ReadArticle() -> impl IntoView {
     let article = article_resource();
 
     view! {
-        <ArticleNav article=article/>
-        <Suspense fallback=|| view! {  "Loading..." }> {
+      <ArticleNav article=article/>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+
+        {
             let parser = markdown_parser();
-            move || article.get().map(|article|
-            view! {
-                <div class="item-view">
-                    <h1>{article_title(&article.article)}</h1>
-                    <div inner_html={parser.parse(&article.article.text).render()}/>
-                </div>
-            })
+            move || {
+                article
+                    .get()
+                    .map(|article| {
+                        view! {
+                          <div class="item-view">
+                            <h1>{article_title(&article.article)}</h1>
+                            <div inner_html=parser.parse(&article.article.text).render()></div>
+                          </div>
+                        }
+                    })
+            }
         }
-        </Suspense>
+
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/conflicts.rs b/src/frontend/pages/conflicts.rs
index f162a1b..7412b1b 100644
--- a/src/frontend/pages/conflicts.rs
+++ b/src/frontend/pages/conflicts.rs
@@ -9,16 +9,27 @@ pub fn Conflicts() -> impl IntoView {
     );
 
     view! {
-        <h1>Your unresolved edit conflicts</h1>
-        <Suspense fallback=|| view! {  "Loading..." }>
-            <ul> {
-                move || conflicts.get().map(|c|
-                    c.into_iter().map(|c| {
-                    let link = format!("{}/edit/{}", article_link(&c.article), c.id);
-                    view! {
-                        <li><a href=link>{article_title(&c.article)}" - "{c.summary}</a></li>
-                }}).collect::<Vec<_>>())
-            } </ul>
-        </Suspense>
+      <h1>Your unresolved edit conflicts</h1>
+      <Suspense fallback=|| view! { "Loading..." }>
+        <ul>
+          {move || {
+              conflicts
+                  .get()
+                  .map(|c| {
+                      c.into_iter()
+                          .map(|c| {
+                              let link = format!("{}/edit/{}", article_link(&c.article), c.id);
+                              view! {
+                                <li>
+                                  <a href=link>{article_title(&c.article)} " - " {c.summary}</a>
+                                </li>
+                              }
+                          })
+                          .collect::<Vec<_>>()
+                  })
+          }}
+
+        </ul>
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/diff.rs b/src/frontend/pages/diff.rs
index 6f0dcac..5adae3b 100644
--- a/src/frontend/pages/diff.rs
+++ b/src/frontend/pages/diff.rs
@@ -8,26 +8,36 @@ pub fn EditDiff() -> impl IntoView {
     let article = article_resource();
 
     view! {
-        <ArticleNav article=article/>
-        <Suspense fallback=|| view! {  "Loading..." }> {
-            move || article.get().map(|article| {
-                let hash = params
-                    .get_untracked()
-                    .get("hash")
-                    .cloned().unwrap();
-                let edit = article.edits.iter().find(|e| e.edit.hash.0.to_string() == hash).unwrap();
-                let label = format!("{} ({})", edit.edit.summary, edit.edit.created.to_rfc2822());
-
-                view! {
-                    <div class="item-view">
+      <ArticleNav article=article/>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+        {move || {
+            article
+                .get()
+                .map(|article| {
+                    let hash = params.get_untracked().get("hash").cloned().unwrap();
+                    let edit = article
+                        .edits
+                        .iter()
+                        .find(|e| e.edit.hash.0.to_string() == hash)
+                        .unwrap();
+                    let label = format!(
+                        "{} ({})",
+                        edit.edit.summary,
+                        edit.edit.created.to_rfc2822(),
+                    );
+                    view! {
+                      <div class="item-view">
                         <h1>{article.article.title.replace('_', " ")}</h1>
                         <h2>{label}</h2>
-                        <p>"by "{user_link(&edit.creator)}</p>
+                        <p>"by " {user_link(&edit.creator)}</p>
                         <pre>{edit.edit.diff.clone()}</pre>
-                    </div>
-                }
-            })
-        }
-        </Suspense>
+                      </div>
+                    }
+                })
+        }}
+
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/instance_details.rs b/src/frontend/pages/instance_details.rs
index f23f187..6c57bc6 100644
--- a/src/frontend/pages/instance_details.rs
+++ b/src/frontend/pages/instance_details.rs
@@ -20,22 +20,32 @@ pub fn InstanceDetails() -> impl IntoView {
     });
 
     view! {
-        <Suspense fallback=|| view! {  "Loading..." }> {
-            move || instance_profile.get().map(|instance: DbInstance| {
-                let instance_ = instance.clone();
-                view! {
-                    <h1>{instance.domain}</h1>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+        {move || {
+            instance_profile
+                .get()
+                .map(|instance: DbInstance| {
+                    let instance_ = instance.clone();
+                    view! {
+                      <h1>{instance.domain}</h1>
 
-                    <Show when=move || global_state.with(|state| state.my_profile.is_some())>
-                        <InstanceFollowButton instance=instance_.clone() />
-                    </Show>
-                    <p>Follow the instance so that new edits are federated to your instance.</p>
-                    <p>"TODO: show a list of articles from the instance. For now you can use the "<a href="/article/list">Article list</a>.</p>
-                    <hr/>
-                    <h2>"Description:"</h2>
-                    <div>{instance.description}</div>
-                }
-            })
-        }</Suspense>
+                      <Show when=move || global_state.with(|state| state.my_profile.is_some())>
+                        <InstanceFollowButton instance=instance_.clone()/>
+                      </Show>
+                      <p>Follow the instance so that new edits are federated to your instance.</p>
+                      <p>
+                        "TODO: show a list of articles from the instance. For now you can use the "
+                        <a href="/article/list">Article list</a> .
+                      </p>
+                      <hr/>
+                      <h2>"Description:"</h2>
+                      <div>{instance.description}</div>
+                    }
+                })
+        }}
+
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/login.rs b/src/frontend/pages/login.rs
index 08385d3..d8a28f6 100644
--- a/src/frontend/pages/login.rs
+++ b/src/frontend/pages/login.rs
@@ -38,21 +38,22 @@ pub fn Login() -> impl IntoView {
     let disabled = Signal::derive(move || wait_for_response.get());
 
     view! {
-        <Show
-            when=move || login_response.get().is_some()
-            fallback=move || {
-                view! {
-                    <CredentialsForm
-                        title="Please enter the desired credentials"
-                        action_label="Login"
-                        action=login_action
-                        error=login_error.into()
-                        disabled
-                    />
-                }
+      <Show
+        when=move || login_response.get().is_some()
+        fallback=move || {
+            view! {
+              <CredentialsForm
+                title="Please enter the desired credentials"
+                action_label="Login"
+                action=login_action
+                error=login_error.into()
+                disabled
+              />
             }
-        >
-            <Redirect path="/"/>
-        </Show>
+        }
+      >
+
+        <Redirect path="/"/>
+      </Show>
     }
 }
diff --git a/src/frontend/pages/register.rs b/src/frontend/pages/register.rs
index 9735814..4eed653 100644
--- a/src/frontend/pages/register.rs
+++ b/src/frontend/pages/register.rs
@@ -39,21 +39,22 @@ pub fn Register() -> impl IntoView {
     let disabled = Signal::derive(move || wait_for_response.get());
 
     view! {
-        <Show
-            when=move || register_response.get().is_some()
-            fallback=move || {
-                view! {
-                    <CredentialsForm
-                        title="Please enter the desired credentials"
-                        action_label="Register"
-                        action=register_action
-                        error=register_error.into()
-                        disabled
-                    />
-                }
+      <Show
+        when=move || register_response.get().is_some()
+        fallback=move || {
+            view! {
+              <CredentialsForm
+                title="Please enter the desired credentials"
+                action_label="Register"
+                action=register_action
+                error=register_error.into()
+                disabled
+              />
             }
-        >
-            <p>"You have successfully registered."</p>
-        </Show>
+        }
+      >
+
+        <p>"You have successfully registered."</p>
+      </Show>
     }
 }
diff --git a/src/frontend/pages/search.rs b/src/frontend/pages/search.rs
index a470ae9..eccdf2a 100644
--- a/src/frontend/pages/search.rs
+++ b/src/frontend/pages/search.rs
@@ -52,45 +52,67 @@ pub fn Search() -> impl IntoView {
     });
 
     view! {
-        <h1>"Search results for "{query}</h1>
-        <Suspense fallback=|| view! {  "Loading..." }> {
-            move || search_results.get().map(move |search_results| {
-                let is_empty = search_results.is_empty();
-                view! {
-                <Show when=move || !is_empty
-                    fallback=move || {
-                        let error_view = move || {
-                            error.get().map(|err| {
-                                view! { <p style="color:red;">{err}</p> }
-                            })
-                        };
+      <h1>"Search results for " {query}</h1>
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
+        {move || {
+            search_results
+                .get()
+                .map(move |search_results| {
+                    let is_empty = search_results.is_empty();
                     view! {
-                        {error_view}
-                        <p>No results found</p>
-                    }}>
-                    <ul>
-                        {
-                            // render resolved instance
-                            if let Some(instance) = &search_results.instance {
-                                let domain = &instance.domain;
-                                vec![view! { <li>
-                                    <a href={format!("/instance/{domain}")}>{domain}</a>
-                                </li>}]
-                            } else { vec![] }
+                      <Show
+                        when=move || !is_empty
+                        fallback=move || {
+                            let error_view = move || {
+                                error
+                                    .get()
+                                    .map(|err| {
+                                        view! { <p style="color:red;">{err}</p> }
+                                    })
+                            };
+                            view! {
+                              {error_view}
+                              <p>No results found</p>
+                            }
                         }
-                        {
-                            // render articles from resolve/search
-                            search_results.articles
-                                .iter()
-                                .map(|a| view! { <li>
-                                    <a href={article_link(a)}>{article_title(a)}</a>
-                                </li>})
-                                .collect::<Vec<_>>()
-                        }
-                    </ul>
-                </Show>
-            }})
-        }
-        </Suspense>
+                      >
+
+                        <ul>
+
+                          // render resolved instance
+                          {if let Some(instance) = &search_results.instance {
+                              let domain = &instance.domain;
+                              vec![
+                                  view! {
+                                    <li>
+                                      <a href=format!("/instance/{domain}")>{domain}</a>
+                                    </li>
+                                  },
+                              ]
+                          } else {
+                              vec![]
+                          }}
+                          // render articles from resolve/search
+                          {search_results
+                              .articles
+                              .iter()
+                              .map(|a| {
+                                  view! {
+                                    <li>
+                                      <a href=article_link(a)>{article_title(a)}</a>
+                                    </li>
+                                  }
+                              })
+                              .collect::<Vec<_>>()}
+
+                        </ul>
+                      </Show>
+                    }
+                })
+        }}
+
+      </Suspense>
     }
 }
diff --git a/src/frontend/pages/user_profile.rs b/src/frontend/pages/user_profile.rs
index 2e940da..ca7a36e 100644
--- a/src/frontend/pages/user_profile.rs
+++ b/src/frontend/pages/user_profile.rs
@@ -22,20 +22,28 @@ pub fn UserProfile() -> impl IntoView {
     });
 
     view! {
+      {move || {
+          error
+              .get()
+              .map(|err| {
+                  view! { <p style="color:red;">{err}</p> }
+              })
+      }}
+
+      <Suspense fallback=|| {
+          view! { "Loading..." }
+      }>
         {move || {
-            error
+            user_profile
                 .get()
-                .map(|err| {
-                    view! { <p style="color:red;">{err}</p> }
+                .map(|person: DbPerson| {
+                    view! {
+                      <h1>{user_title(&person)}</h1>
+                      <p>TODO: create actual user profile</p>
+                    }
                 })
         }}
-        <Suspense fallback=|| view! {  "Loading..." }> {
-            move || user_profile.get().map(|person: DbPerson| {
-                view! {
-                    <h1>{user_title(&person)}</h1>
-                    <p>TODO: create actual user profile</p>
-                }
-            })
-        }</Suspense>
+
+      </Suspense>
     }
 }
diff --git a/src/main.rs b/src/main.rs
index f010d12..b4a3743 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,6 +28,6 @@ fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
     mount_to_body(|| {
-        view! {  <App/> }
+        view! { <App/> }
     });
 }