diff --git a/public/locale/en.json b/public/locale/en.json
index 10486c83b99..f5cc64ef685 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -707,6 +707,7 @@
   "criticality": "Criticality",
   "csv_file_in_the_specified_format": "Select a CSV file in the specified format",
   "current_address": "Current Address",
+  "current_organizations": "Current Organizations",
   "current_password": "Current Password",
   "current_role": "Current Role",
   "current_status": "Current Status",
@@ -898,6 +899,7 @@
   "encounter_discharge_disposition__snf": "Skilled nursing facility",
   "encounter_duration_confirmation": "The duration of this encounter would be",
   "encounter_id": "Encounter ID",
+  "encounter_manage_organization_description": "Add or remove organizations from this encouter",
   "encounter_marked_as_complete": "Encounter Completed",
   "encounter_notes__all_discussions": "All Discussions",
   "encounter_notes__be_first_to_send": "Be the first to send a message",
@@ -1361,6 +1363,7 @@
   "next_week_short": "Next wk",
   "no": "No",
   "no_address_provided": "No address provided",
+  "no_allergies_recorded": "No allergies recorded",
   "no_appointments": "No appointments found",
   "no_attachments_found": "This communication has no attachments.",
   "no_availabilities_yet": "No availabilities yet",
@@ -1392,6 +1395,7 @@
   "no_notices_for_you": "No notices for you.",
   "no_observations": "No Observations",
   "no_ongoing_medications": "No Ongoing Medications",
+  "no_organizations_added_yet": "No organizations added yet",
   "no_organizations_found": "No organizations found",
   "no_organizations_found_matching": "No organizations found matching {{searchQuery}}",
   "no_organizations_selected": "No organizations selected",
diff --git a/src/components/Patient/ManageEncounterOrganizations.tsx b/src/components/Patient/ManageEncounterOrganizations.tsx
index 00ff39b8165..9c2b8c169ca 100644
--- a/src/components/Patient/ManageEncounterOrganizations.tsx
+++ b/src/components/Patient/ManageEncounterOrganizations.tsx
@@ -1,4 +1,5 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { t } from "i18next";
 import { Building, Loader2, Trash2 } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -81,22 +82,21 @@ export default function ManageEncounterOrganizations({
         {trigger || (
           <Button variant="outline" size="sm">
             <Building className="mr-2 h-4 w-4" />
-            Manage Organizations
+            {t("manage_organizations")}
           </Button>
         )}
       </SheetTrigger>
       <SheetContent>
         <SheetHeader>
-          <SheetTitle>Manage Organizations</SheetTitle>
+          <SheetTitle>{t("manage_organizations")}</SheetTitle>
           <SheetDescription>
-            Add or remove organizations from this encounter
+            {t("encounter_manage_organization_description")}
           </SheetDescription>
         </SheetHeader>
 
         <div className="space-y-6 py-4">
           <div className="space-y-4">
             <div className="space-y-4">
-              <h3 className="text-sm font-medium">Add Organization</h3>
               <FacilityOrganizationSelector
                 facilityId={facilityId}
                 value={selectedOrg}
@@ -109,12 +109,14 @@ export default function ManageEncounterOrganizations({
                 disabled={!selectedOrg || isAdding}
               >
                 {isAdding && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-                Add Organization
+                {t("add_organizations")}
               </Button>
             </div>
 
             <div className="space-y-4">
-              <h3 className="text-sm font-medium">Current Organizations</h3>
+              <h3 className="text-sm font-medium">
+                {t("current_organizations")}
+              </h3>
               <div className="space-y-2">
                 {encounter.organizations.map((org) => (
                   <div
@@ -148,7 +150,7 @@ export default function ManageEncounterOrganizations({
                 ))}
                 {encounter.organizations.length === 0 && (
                   <p className="text-sm text-muted-foreground">
-                    No organizations added yet
+                    {t("no_organizations_added_yet")}
                   </p>
                 )}
               </div>
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx
index 456f61c759e..9d9e324fb61 100644
--- a/src/components/Patient/allergy/list.tsx
+++ b/src/components/Patient/allergy/list.tsx
@@ -37,7 +37,7 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) {
     return (
       <Card>
         <CardHeader>
-          <CardTitle>Allergies</CardTitle>
+          <CardTitle>{t("allergies")}</CardTitle>
         </CardHeader>
         <CardContent>
           <Skeleton className="h-[100px] w-full" />
@@ -50,10 +50,10 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) {
     return (
       <Card>
         <CardHeader>
-          <CardTitle>Allergies</CardTitle>
+          <CardTitle>{t("allergies")}</CardTitle>
         </CardHeader>
         <CardContent>
-          <p className="text-muted-foreground">No allergies recorded</p>
+          <p className="text-muted-foreground">{t("no_allergies_recorded")}</p>
         </CardContent>
       </Card>
     );
@@ -136,7 +136,10 @@ export function AllergyList({ patientId, encounterId }: AllergyListProps) {
                     className="w-4 h-4"
                     imageUrl={allergy.created_by.profile_picture_url}
                   />
-                  <span className="text-sm">{allergy.created_by.username}</span>
+                  <span className="text-sm">
+                    {allergy.created_by?.first_name}{" "}
+                    {allergy.created_by?.last_name}
+                  </span>
                 </TableCell>
               </TableRow>
             ))}
diff --git a/src/pages/Encounters/EncounterShow.tsx b/src/pages/Encounters/EncounterShow.tsx
index 0440aa49aae..f68c01a6725 100644
--- a/src/pages/Encounters/EncounterShow.tsx
+++ b/src/pages/Encounters/EncounterShow.tsx
@@ -241,8 +241,8 @@ export const EncounterShow = (props: Props) => {
           </Link>
         </div>
       </nav>
-      <div className="mt-4 w-full border-b-2 border-secondary-200">
-        <div className="mt-2 flex w-full flex-col md:flex-row">
+      <div className="mt-4 xl:mt-0 w-full border-b-2 border-secondary-200">
+        <div className="mt-2 xl:mt-0 flex w-full flex-col md:flex-row">
           <div className="size-full rounded-lg border bg-white text-black shadow">
             <PatientInfoCard
               patient={encounterData.patient}