applied patch

app/src/components/app.rs

@@ -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! {
+                      if let Some((user_id, _)) = &self.user_info {
+                        html! {
                           <span class="ms-2">
                             {user_id}
                           </span>
                         }
                       } else { html!{} }
                     }
-            // end show user id
                   </a>
                   {if let Some((user_id, _)) = &self.user_info { html! {
                     <ul

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>
+            <div class="mb-2 mt-2">
-            { if let Some(e) = &self.common.error {
+              <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() }

app/src/components/create_group.rs

@@ -132,7 +132,7 @@ impl Component for CreateGroupForm {
                   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"}
+                  {"Submit"}
                 </button>
               </div>
             </form>

app/src/components/create_user.rs

@@ -347,11 +347,12 @@ impl Component for CreateUserForm {
                   type="submit"
                   onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::SubmitForm})>
                   <i class="bi-save me-2"></i>
-                  {"Save changes"}
+                  {"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() }

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>
                     }

app/src/components/user_details_form.rs

@@ -319,7 +319,8 @@ impl Component for UserDetailsForm {
                 </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() }