diff --git a/TODO.md b/TODO.md
index 2353a83..f85fb37 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,7 @@ golive:
 - [x] Pre-commit hookspo
 - [x] Schema changes
 - [-] Error handling in the services
-- [ ] Add more comments to the code
+- [x] Add more comments to the code
 - [ ] Demo deployment environment
 - [ ] Developer docs
 - [ ] Screenshots
diff --git a/web/components/Loading.jinja b/web/components/LazyLoad.jinja
similarity index 66%
rename from web/components/Loading.jinja
rename to web/components/LazyLoad.jinja
index 138505c..0c85010 100644
--- a/web/components/Loading.jinja
+++ b/web/components/LazyLoad.jinja
@@ -1,8 +1,9 @@
 {#def
   hx_get: str,
   hx_trigger: str,
-  hx_swap: str = "outerHTML"
+  hx_swap: str = "outerHTML",
 #}
+<!-- lazy load -->
 <div hx-get="{{ hx_get }}" hx-trigger="{{ hx_trigger }}" hx-swap="{{ hx_swap }}">
-  <SvgLoader />
+  <SvgLoading />
 </div>
diff --git a/web/components/SvgLoader.jinja b/web/components/SvgLoading.jinja
similarity index 100%
rename from web/components/SvgLoader.jinja
rename to web/components/SvgLoading.jinja
diff --git a/web/components/user/UserList.jinja b/web/components/user/UserList.jinja
index c971e3e..d43dde3 100644
--- a/web/components/user/UserList.jinja
+++ b/web/components/user/UserList.jinja
@@ -35,6 +35,7 @@
 
 <section
   id="user_list"
+  class="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8"
   hx-get="{{ get_users_list(page.page, page.page_size, page.order_by, page.ascending) }}"
   hx-trigger="refresh from:body"
 >
diff --git a/web/templates/pages/dashboard.html b/web/templates/pages/dashboard.html
index 2235f88..5cf583d 100644
--- a/web/templates/pages/dashboard.html
+++ b/web/templates/pages/dashboard.html
@@ -9,11 +9,11 @@ <h1 class="pl-2 pt-2 text-lg font-semibold leading-6 text-gray-900 dark:text-gra
     <!-- row of stats -->
     <dl class="mt-5 grid grid-cols-1 gap-5 sm:grid-cols-3">
       <!-- Total Users -->
-      <Loading hx_get="/dashboard/users/count" hx_trigger="load" />
+      <LazyLoad hx_get="/dashboard/users/count" hx_trigger="load" />
       <!-- Active Users -->
-      <Loading hx_get="/dashboard/users/active_count" hx_trigger="load" />
+      <LazyLoad hx_get="/dashboard/users/active_count" hx_trigger="load" />
       <!-- Admin Users -->
-      <Loading hx_get="/dashboard/users/admin_count" hx_trigger="load" />
+      <LazyLoad hx_get="/dashboard/users/admin_count" hx_trigger="load" />
     </dl>
   </div>
 </Admin>
diff --git a/web/templates/pages/users.html b/web/templates/pages/users.html
index c98e0f4..58e9fbc 100644
--- a/web/templates/pages/users.html
+++ b/web/templates/pages/users.html
@@ -17,18 +17,12 @@ <h1 class="text-lg font-semibold leading-6 text-gray-900 dark:text-gray-100">Use
         </a>
       </div>
     </div>
-    <!-- list -->
+    <!-- list users -->
     <div class="mt-8 flow-root px-4 py-3 sm:px-6">
+      <!-- overflow for row highlight -->
       <div class="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
         <!-- lazily load the list of users, replace div content with response returned from hx-get -->
-        <div
-          id="get-user-list"
-          class="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8"
-          hx-get="/users/list"
-          hx-trigger="load"
-        >
-          <SvgLoader />
-        </div>
+        <LazyLoad hx_get="/users/list" hx_trigger="load" />
       </div>
     </div>
     <!-- list -->