diff --git a/app/src/components/app.rs b/app/src/components/app.rs
index f52a890..7f35c43 100644
--- a/app/src/components/app.rs
+++ b/app/src/components/app.rs
@@ -98,8 +98,8 @@ impl Component for App {
         let link = self.link.clone();
         let is_admin = self.is_admin();
         html! {
-            <div>
-              {self.view_banner()}
+          <div>
+            {self.view_banner()}
             <div class="container py-3 bg-kug">
               <div class="row justify-content-center" style="padding-bottom: 80px;">
                 <div class="py-3" style="max-width: 1000px">
@@ -109,8 +109,8 @@ impl Component for App {
                 </div>
               </div>
               {self.view_footer()}
-             </div>
             </div>
+          </div>
         }
     }
 }
@@ -174,9 +174,9 @@ impl App {
                 <div>
                   <UserTable />
                   <NavButton classes="btn btn-primary" route=AppRoute::CreateUser>
-                  <i class="bi-person-plus me-2"></i>
-                {"Create a user"}
-                </NavButton>
+                    <i class="bi-person-plus me-2"></i>
+                    {"Create a user"}
+                  </NavButton>
                 </div>
             },
             AppRoute::CreateGroup => html! {
@@ -186,9 +186,9 @@ impl App {
                 <div>
                   <GroupTable />
                   <NavButton classes="btn btn-primary" route=AppRoute::CreateGroup>
-                 <i class="bi-plus-circle me-2"></i>
-                {"Create a group"}
-                </NavButton>
+                    <i class="bi-plus-circle me-2"></i>
+                    {"Create a group"}
+                  </NavButton>
                 </div>
             },
             AppRoute::GroupDetails(group_id) => html! {
@@ -225,7 +225,7 @@ impl App {
                         <Link
                           classes="nav-link px-2 link-dark h6"
                           route=AppRoute::ListUsers>
-                         <i class="bi-people me-2"></i>
+                          <i class="bi-people me-2"></i>
                           {"Users"}
                         </Link>
                       </li>
@@ -233,7 +233,7 @@ impl App {
                         <Link
                           classes="nav-link px-2 link-dark h6"
                           route=AppRoute::ListGroups>
-                       <i class="bi-collection me-2"></i>
+                          <i class="bi-collection me-2"></i>
                           {"Groups"}
                         </Link>
                       </li>
@@ -256,15 +256,15 @@ impl App {
                       <path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/>
                       <path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/>
                     </svg>
-              // show user id
-            {if let Some((user_id, _)) = &self.user_info { html! {
-                <span class="ms-2">
-                    {user_id}
-                 </span>
-             }
-                 } else { html!{} }
-             }
-            // end show user id
+                    {
+                      if let Some((user_id, _)) = &self.user_info {
+                        html! {
+                          <span class="ms-2">
+                            {user_id}
+                          </span>
+                        }
+                      } else { html!{} }
+                    }
                   </a>
                   {if let Some((user_id, _)) = &self.user_info { html! {
                     <ul
diff --git a/app/src/components/change_password.rs b/app/src/components/change_password.rs
index 2de1b76..91e1673 100644
--- a/app/src/components/change_password.rs
+++ b/app/src/components/change_password.rs
@@ -220,8 +220,13 @@ impl Component for ChangePasswordForm {
         type Field = yew_form::Field<FormModel>;
         html! {
           <>
-               <div class="mb-2 mt-2"><h5 class="fw-bold">{"Change password"}</h5></div>
-            { if let Some(e) = &self.common.error {
+            <div class="mb-2 mt-2">
+              <h5 class="fw-bold">
+                {"Change password"}
+              </h5>
+            </div>
+            {
+              if let Some(e) = &self.common.error {
                 html! {
                   <div class="alert alert-danger mt-3 mb-3">
                     {e.to_string() }
@@ -256,8 +261,8 @@ impl Component for ChangePasswordForm {
                 <label for="new_password"
                   class="form-label col-sm-2 col-form-label">
                    {"New Password"}
-             <span class="text-danger">{"*"}</span>
-            {":"}
+                   <span class="text-danger">{"*"}</span>
+                   {":"}
                 </label>
                 <div class="col-sm-10">
                   <Field
@@ -277,9 +282,9 @@ impl Component for ChangePasswordForm {
               <div class="form-group row mb-3">
                 <label for="confirm_password"
                   class="form-label col-sm-2 col-form-label">
-                {"Confirm Password"}
-            <span class="text-danger">{"*"}</span>
-                {":"}
+                  {"Confirm Password"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
                 </label>
                 <div class="col-sm-10">
                   <Field
@@ -296,21 +301,21 @@ impl Component for ChangePasswordForm {
                   </div>
                 </div>
               </div>
-               <div class="form-group row justify-content-center">
+              <div class="form-group row justify-content-center">
                 <button
                   class="btn btn-primary col-auto col-form-label"
                   type="submit"
                   disabled=self.common.is_task_running()
                   onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})>
-               <i class="bi-save me-2"></i>
+                  <i class="bi-save me-2"></i>
                   {"Save changes"}
                 </button>
-              <NavButton
-                classes="btn btn-secondary ms-2 col-auto col-form-label"
-                route=AppRoute::UserDetails(self.common.username.clone())>
-              <i class="bi-arrow-return-left me-2"></i>
-                {"Back"}
-              </NavButton>
+                <NavButton
+                  classes="btn btn-secondary ms-2 col-auto col-form-label"
+                  route=AppRoute::UserDetails(self.common.username.clone())>
+                  <i class="bi-arrow-return-left me-2"></i>
+                  {"Back"}
+                </NavButton>
               </div>
             </form>
           </>
diff --git a/app/src/components/create_group.rs b/app/src/components/create_group.rs
index 78dbb5e..d3e9b45 100644
--- a/app/src/components/create_group.rs
+++ b/app/src/components/create_group.rs
@@ -107,10 +107,10 @@ impl Component for CreateGroupForm {
               <div class="form-group row mb-3">
                 <label for="groupname"
                   class="form-label col-4 col-form-label">
-            {"Group name"}
-            <span class="text-danger">{"*"}</span>
-            {":"}
-            </label>
+                  {"Group name"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
+                </label>
                 <div class="col-8">
                   <Field
                     form=&self.form
@@ -131,8 +131,8 @@ impl Component for CreateGroupForm {
                   type="submit"
                   disabled=self.common.is_task_running()
                   onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})>
-                    <i class="bi-save me-2"></i>
-                  {"Save changes"}
+                  <i class="bi-save me-2"></i>
+                  {"Submit"}
                 </button>
               </div>
             </form>
diff --git a/app/src/components/create_user.rs b/app/src/components/create_user.rs
index 3be1307..b167bef 100644
--- a/app/src/components/create_user.rs
+++ b/app/src/components/create_user.rs
@@ -19,10 +19,10 @@ use yew_router::{
 
 #[derive(GraphQLQuery)]
 #[graphql(
-schema_path = "../schema.graphql",
-query_path = "queries/create_user.graphql",
-response_derives = "Debug",
-custom_scalars_module = "crate::infra::graphql"
+    schema_path = "../schema.graphql",
+    query_path = "queries/create_user.graphql",
+    response_derives = "Debug",
+    custom_scalars_module = "crate::infra::graphql"
 )]
 pub struct CreateUser;
 
@@ -43,8 +43,8 @@ pub struct CreateUserModel {
     first_name: String,
     last_name: String,
     #[validate(custom(
-    function = "empty_or_long",
-    message = "Password should be longer than 8 characters (or left empty)"
+        function = "empty_or_long",
+        message = "Password should be longer than 8 characters (or left empty)"
     ))]
     password: String,
     #[validate(must_match(other = "password", message = "Passwords must match"))]
@@ -201,9 +201,9 @@ impl Component for CreateUserForm {
               <div class="form-group row mb-3">
                 <label for="username"
                   class="form-label col-4 col-form-label">
-            {"User name"}
-            <span class="text-danger">{"*"}</span>
-            {":"}
+                  {"User name"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
                 </label>
                 <div class="col-8">
                   <Field
@@ -223,8 +223,8 @@ impl Component for CreateUserForm {
                 <label for="email"
                   class="form-label col-4 col-form-label">
                   {"Email"}
-                <span class="text-danger">{"*"}</span>
-                    {":"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
                 </label>
                 <div class="col-8">
                   <Field
@@ -244,9 +244,9 @@ impl Component for CreateUserForm {
               <div class="form-group row mb-3">
                 <label for="display-name"
                   class="form-label col-4 col-form-label">
-                {"Display name"}
-                <span class="text-danger">{"*"}</span>
-                {":"}
+                  {"Display name"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
                 </label>
                 <div class="col-8">
                   <Field
@@ -346,12 +346,13 @@ impl Component for CreateUserForm {
                   disabled=self.common.is_task_running()
                   type="submit"
                   onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})>
-                    <i class="bi-save me-2"></i>
-                  {"Save changes"}
+                  <i class="bi-save me-2"></i>
+                  {"Submit"}
                 </button>
               </div>
             </form>
-            { if let Some(e) = &self.common.error {
+            {
+              if let Some(e) = &self.common.error {
                 html! {
                   <div class="alert alert-danger">
                     {e.to_string() }
diff --git a/app/src/components/delete_group.rs b/app/src/components/delete_group.rs
index dbb1a94..881f55f 100644
--- a/app/src/components/delete_group.rs
+++ b/app/src/components/delete_group.rs
@@ -154,16 +154,16 @@ impl DeleteGroup {
                     type="button"
                     class="btn btn-secondary"
                     onclick=self.common.callback(|_| Msg::DismissModal)>
-             <i class="bi-x-circle me-2"></i>
+                      <i class="bi-x-circle me-2"></i>
                       {"Cancel"}
                   </button>
                   <button
                     type="button"
                     onclick=self.common.callback(|_| Msg::ConfirmDeleteGroup)
                     class="btn btn-danger">
-               <i class="bi-check-circle me-2"></i>
-            {"Yes, I'm sure"}
-            </button>
+                    <i class="bi-check-circle me-2"></i>
+                    {"Yes, I'm sure"}
+                 </button>
                 </div>
               </div>
             </div>
diff --git a/app/src/components/delete_user.rs b/app/src/components/delete_user.rs
index 9f950d3..a003917 100644
--- a/app/src/components/delete_user.rs
+++ b/app/src/components/delete_user.rs
@@ -152,16 +152,16 @@ impl DeleteUser {
                     type="button"
                     class="btn btn-secondary"
                     onclick=self.common.callback(|_| Msg::DismissModal)>
-              <i class="bi-x-circle me-2"></i>
-                      {"Cancel"}
+                    <i class="bi-x-circle me-2"></i>
+                    {"Cancel"}
                   </button>
                   <button
                     type="button"
                     onclick=self.common.callback(|_| Msg::ConfirmDeleteUser)
                     class="btn btn-danger">
-              <i class="bi-check-circle me-2"></i>
-            {"Yes, I'm sure"}
-            </button>
+                    <i class="bi-check-circle me-2"></i>
+                    {"Yes, I'm sure"}
+                  </button>
                 </div>
               </div>
             </div>
diff --git a/app/src/components/group_details.rs b/app/src/components/group_details.rs
index 3e25178..ecba623 100644
--- a/app/src/components/group_details.rs
+++ b/app/src/components/group_details.rs
@@ -145,7 +145,7 @@ impl GroupDetails {
                   {if g.users.is_empty() {
                     html! {
                       <tr key="EmptyRow">
-                        <td>{"There are currently no users in this group."}</td>
+                        <td>{"There are no users in this group."}</td>
                         <td/>
                       </tr>
                     }
diff --git a/app/src/components/login.rs b/app/src/components/login.rs
index ece8645..0503e95 100644
--- a/app/src/components/login.rs
+++ b/app/src/components/login.rs
@@ -195,7 +195,7 @@ impl Component for LoginForm {
                       class="btn btn-primary"
                       disabled=self.common.is_task_running()
                       onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})>
-                <i class="bi-box-arrow-in-right me-2"/>
+                      <i class="bi-box-arrow-in-right me-2"/>
                       {"Login"}
                     </button>
                     <NavButton
diff --git a/app/src/components/reset_password_step1.rs b/app/src/components/reset_password_step1.rs
index d35310d..c936c92 100644
--- a/app/src/components/reset_password_step1.rs
+++ b/app/src/components/reset_password_step1.rs
@@ -113,7 +113,7 @@ impl Component for ResetPasswordStep1Form {
                             class="btn btn-primary"
                             disabled=self.common.is_task_running()
                             onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})>
-                        <i class="bi-check-circle me-2"/>
+                            <i class="bi-check-circle me-2"/>
                             {"Reset password"}
                           </button>
                           <NavButton
diff --git a/app/src/components/user_details.rs b/app/src/components/user_details.rs
index 9113e06..ae5e20e 100644
--- a/app/src/components/user_details.rs
+++ b/app/src/components/user_details.rs
@@ -201,12 +201,12 @@ impl Component for UserDetails {
                       <NavButton
                         route=AppRoute::ChangePassword(u.id.clone())
                         classes="btn btn-secondary">
-                      <i class="bi-key me-2"></i>
-                          {"Modify password"}
+                        <i class="bi-key me-2"></i>
+                        {"Modify password"}
                       </NavButton>
                     </div>
                     <div>
-                       <h5 class="row m-3 fw-bold">{"User details"}</h5>
+                      <h5 class="row m-3 fw-bold">{"User details"}</h5>
                     </div>
                     <UserDetailsForm
                       user=u.clone() />
diff --git a/app/src/components/user_details_form.rs b/app/src/components/user_details_form.rs
index a4529ee..2f5dbf3 100644
--- a/app/src/components/user_details_form.rs
+++ b/app/src/components/user_details_form.rs
@@ -52,11 +52,11 @@ pub struct UserModel {
 /// The GraphQL query sent to the server to update the user details.
 #[derive(GraphQLQuery)]
 #[graphql(
-schema_path = "../schema.graphql",
-query_path = "queries/update_user.graphql",
-response_derives = "Debug",
-variables_derives = "Clone,PartialEq,Eq",
-custom_scalars_module = "crate::infra::graphql"
+    schema_path = "../schema.graphql",
+    query_path = "queries/update_user.graphql",
+    response_derives = "Debug",
+    variables_derives = "Clone,PartialEq,Eq",
+    custom_scalars_module = "crate::infra::graphql"
 )]
 pub struct UpdateUser;
 
@@ -180,7 +180,7 @@ impl Component for UserDetailsForm {
         html! {
           <div class="py-3">
             <form class="form">
-            <div class="form-group row mb-3">
+              <div class="form-group row mb-3">
                 <label for="userId"
                   class="form-label col-4 col-form-label">
                   {"User ID: "}
@@ -189,10 +189,10 @@ impl Component for UserDetailsForm {
                   <span id="userId" class="form-control-static"><i>{&self.common.user.id}</i></span>
                 </div>
               </div>
-            <div class="form-group row mb-3">
+              <div class="form-group row mb-3">
                 <label for="creationDate"
-                class="form-label col-4 col-form-label">
-                {"Creation date: "}
+                  class="form-label col-4 col-form-label">
+                  {"Creation date: "}
                 </label>
                 <div class="col-8">
                   <span id="creationDate" class="form-control-static">{&self.common.user.creation_date.date().naive_local()}</span>
@@ -200,8 +200,8 @@ impl Component for UserDetailsForm {
               </div>
               <div class="form-group row mb-3">
                 <label for="uuid"
-                class="form-label col-4 col-form-label">
-                {"UUID: "}
+                  class="form-label col-4 col-form-label">
+                  {"UUID: "}
                 </label>
                 <div class="col-8">
                   <span id="creationDate" class="form-control-static">{&self.common.user.uuid}</span>
@@ -210,9 +210,9 @@ impl Component for UserDetailsForm {
               <div class="form-group row mb-3">
                 <label for="email"
                   class="form-label col-4 col-form-label">
-            {"Email"}
-            <span class="text-danger">{"*"}</span>
-            {":"}
+                  {"Email"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
                 </label>
                 <div class="col-8">
                   <Field
@@ -232,8 +232,8 @@ impl Component for UserDetailsForm {
                 <label for="display_name"
                   class="form-label col-4 col-form-label">
                   {"Display Name"}
-             <span class="text-danger">{"*"}</span>
-            {":"}
+                  <span class="text-danger">{"*"}</span>
+                  {":"}
                 </label>
                 <div class="col-8">
                   <Field
@@ -283,30 +283,30 @@ impl Component for UserDetailsForm {
                   </div>
                 </div>
               </div>
-            <div class="form-group row align-items-center mb-3">
+              <div class="form-group row align-items-center mb-3">
                 <label for="avatar"
                   class="form-label col-4 col-form-label">
                   {"Avatar: "}
                 </label>
                 <div class="col-8">
-            <div class="row align-items-center">
-            <div class="col-8">
-                   <input
-                    class="form-control"
-                    id="avatarInput"
-                    type="file"
-                    accept="image/jpeg"
-                    oninput=self.common.callback(|_| Msg::Update) />
-            </div>
-            <div class="col-4">
-                        <img
-                    id="avatarDisplay"
-                    src={format!("data:image/jpeg;base64, {}", avatar_string)}
-                    style="max-height:128px;max-width:128px;height:auto;width:auto;"
-                    alt="Avatar" />
-            </div>
-            </div>
-            </div>
+                  <div class="row align-items-center">
+                    <div class="col-8">
+                      <input
+                        class="form-control"
+                        id="avatarInput"
+                        type="file"
+                        accept="image/jpeg"
+                        oninput=self.common.callback(|_| Msg::Update) />
+                    </div>
+                    <div class="col-4">
+                      <img
+                        id="avatarDisplay"
+                        src={format!("data:image/jpeg;base64, {}", avatar_string)}
+                        style="max-height:128px;max-width:128px;height:auto;width:auto;"
+                        alt="Avatar" />
+                    </div>
+                  </div>
+                </div>
               </div>
               <div class="form-group row justify-content-center mt-3">
                 <button
@@ -314,12 +314,13 @@ impl Component for UserDetailsForm {
                   class="btn btn-primary col-auto col-form-label"
                   disabled=self.common.is_task_running()
                   onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitClicked})>
-              <i class="bi-save me-2"></i>
+                  <i class="bi-save me-2"></i>
                   {"Save changes"}
                 </button>
               </div>
             </form>
-            { if let Some(e) = &self.common.error {
+            {
+              if let Some(e) = &self.common.error {
                 html! {
                   <div class="alert alert-danger">
                     {e.to_string() }