diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx
index 5c898e336da..3d068034791 100644
--- a/src/components/Common/UserSelector.tsx
+++ b/src/components/Common/UserSelector.tsx
@@ -71,7 +71,7 @@ export default function UserSelector({
                 className="size-6 rounded-full"
               />
               <TooltipComponent content={formatName(selected)} side="bottom">
-                <p className="font-medium text-gray-900 truncate max-w-56 sm:max-w-48 md:max-w-64 lg:max-w-64 xl:max-w-36">
+                <p className="font-medium text-gray-900 truncate max-w-48 sm:max-w-56 md:max-w-64">
                   {formatName(selected)}
                 </p>
               </TooltipComponent>
diff --git a/src/components/Users/UserListAndCard.tsx b/src/components/Users/UserListAndCard.tsx
index bf8b2b3e96d..c11c2bc5199 100644
--- a/src/components/Users/UserListAndCard.tsx
+++ b/src/components/Users/UserListAndCard.tsx
@@ -64,7 +64,10 @@ export const UserStatusIndicator = ({
           </span>
         </Badge>
       ) : (
-        <Badge variant="secondary" className="bg-gray-100 whitespace-nowrap">
+        <Badge
+          variant="secondary"
+          className="bg-gray-100 whitespace-nowrap text-wrap"
+        >
           <span className="inline-block h-2 w-2 shrink-0 rounded-full bg-gray-500 mr-2" />
           <span className="text-xs text-gray-700">{t("never_logged_in")}</span>
         </Badge>
diff --git a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
index dfae40ba31f..6af8838d2dd 100644
--- a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
+++ b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx
@@ -157,18 +157,22 @@ export default function EditUserRoleSheet({
               </div>
             </div>
 
-            <div className="grid grid-cols-2 gap-4 pt-2 border-t">
-              <div>
-                <span className="text-sm text-gray-500">{t("username")}</span>
-                <p className="text-sm font-medium">{userRole.user.username}</p>
+            <div className="flex flex-col flex-wrap gap-2 pt-2 border-t">
+              <div className="flex flex-wrap">
+                <div className="mr-3">
+                  <span className="text-sm text-gray-500">{t("username")}</span>
+                  <p className="text-sm font-medium truncate ">
+                    {userRole.user.username}
+                  </p>
+                </div>
+                <div>
+                  <span className="text-sm text-gray-500">
+                    {t("current_role")}
+                  </span>
+                  <p className="text-sm font-medium">{userRole.role.name}</p>
+                </div>
               </div>
               <div>
-                <span className="text-sm text-gray-500">
-                  {t("current_role")}
-                </span>
-                <p className="text-sm font-medium">{userRole.role.name}</p>
-              </div>
-              <div className="col-span-2">
                 <span className="text-sm text-gray-500">
                   {t("last_login")}{" "}
                 </span>
diff --git a/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx b/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx
index c0cb464b2b1..8c7cea2e719 100644
--- a/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx
+++ b/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx
@@ -136,16 +136,16 @@ export default function LinkFacilityUserSheet({
           {selectedUser && (
             <div className="space-y-4">
               <div className="rounded-lg border p-4 space-y-4">
-                <div className="flex items-start gap-4">
+                <div className="flex gap-4 flex-row">
                   <Avatar
                     imageUrl={selectedUser.profile_picture_url}
                     name={formatName(selectedUser)}
                     className="h-12 w-12"
                   />
-                  <div className="flex flex-col flex-1">
-                    <span className="font-medium text-lg">
+                  <div className="w-3/4">
+                    <p className="font-medium text-lg truncate">
                       {selectedUser.first_name} {selectedUser.last_name}
-                    </span>
+                    </p>
                     <span className="text-sm text-gray-500">
                       {selectedUser.email}
                     </span>
@@ -153,7 +153,7 @@ export default function LinkFacilityUserSheet({
                 </div>
 
                 <div className="grid grid-cols-2 gap-4 pt-2 border-t">
-                  <div>
+                  <div className="truncate">
                     <span className="text-sm text-gray-500">Username</span>
                     <p className="text-sm font-medium">
                       {selectedUser.username}
diff --git a/src/pages/Organization/OrganizationUsers.tsx b/src/pages/Organization/OrganizationUsers.tsx
index e05e6374097..b81c3313b17 100644
--- a/src/pages/Organization/OrganizationUsers.tsx
+++ b/src/pages/Organization/OrganizationUsers.tsx
@@ -102,7 +102,7 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) {
   return (
     <OrganizationLayout id={id} navOrganizationId={navOrganizationId}>
       <div className="space-y-6">
-        <div className="flex justify-between items-center">
+        <div className="justify-between items-center flex flex-wrap">
           <div className="mt-1 flex flex-col justify-start space-y-2 md:flex-row md:justify-between md:space-y-0">
             <EntityBadge
               title={t("users")}
@@ -111,7 +111,7 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) {
               translationParams={{ entity: "User" }}
             />
           </div>
-          <div className="flex gap-2">
+          <div className="gap-2 flex flex-wrap mt-2">
             <AddUserSheet
               open={openAddUserSheet}
               setOpen={(open) => {
diff --git a/src/pages/Organization/components/LinkUserSheet.tsx b/src/pages/Organization/components/LinkUserSheet.tsx
index 967783d61be..a442cdf1a3e 100644
--- a/src/pages/Organization/components/LinkUserSheet.tsx
+++ b/src/pages/Organization/components/LinkUserSheet.tsx
@@ -111,7 +111,7 @@ export default function LinkUserSheet({
   return (
     <Sheet open={open} onOpenChange={setOpen}>
       <SheetTrigger asChild>
-        <Button>
+        <Button variant="primary_gradient">
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
           Link User
         </Button>
@@ -135,16 +135,16 @@ export default function LinkUserSheet({
           {selectedUser && (
             <div className="space-y-4">
               <div className="rounded-lg border p-4 space-y-4">
-                <div className="flex items-start gap-4">
+                <div className="flex gap-4 flex-row">
                   <Avatar
                     name={`${selectedUser.first_name} ${selectedUser.last_name}`}
                     imageUrl={selectedUser.profile_picture_url}
                     className="h-12 w-12"
                   />
-                  <div className="flex flex-col flex-1">
-                    <span className="font-medium text-lg">
+                  <div className="w-3/4">
+                    <p className="font-medium text-lg truncate">
                       {selectedUser.first_name} {selectedUser.last_name}
-                    </span>
+                    </p>
                     <span className="text-sm text-gray-500">
                       {selectedUser.email}
                     </span>
@@ -154,7 +154,7 @@ export default function LinkUserSheet({
                 <div className="grid grid-cols-2 gap-4 pt-2 border-t">
                   <div>
                     <span className="text-sm text-gray-500">Username</span>
-                    <p className="text-sm font-medium">
+                    <p className="text-sm font-medium truncate">
                       {selectedUser.username}
                     </p>
                   </div>
@@ -192,7 +192,6 @@ export default function LinkUserSheet({
                   </SelectContent>
                 </Select>
               </div>
-
               <Button
                 className="w-full"
                 onClick={handleAddUser}