diff --git a/package-lock.json b/package-lock.json
index b3b93ff..102a53e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3588,6 +3588,126 @@
         "glob": "10.3.10"
       }
     },
+    "node_modules/@next/swc-darwin-arm64": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz",
+      "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz",
+      "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz",
+      "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-musl": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz",
+      "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-gnu": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz",
+      "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-musl": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz",
+      "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz",
+      "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz",
+      "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@next/swc-win32-x64-msvc": {
       "version": "14.2.4",
       "cpu": [
@@ -15322,126 +15442,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz",
-      "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz",
-      "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz",
-      "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz",
-      "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz",
-      "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz",
-      "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz",
-      "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz",
-      "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
     }
   }
 }
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 2485394..7a81d9d 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -9,7 +9,7 @@ import clientContext from "../context/clientContext";
 
 function MyApp({ Component, pageProps }: AppProps) {
     const [client, setClient] = useState<Client>(undefined!);
-    const [loading, setLoading] = useState<boolean>(false);
+    const [loading, setLoading] = useState<boolean>(true);
 
 	useEffect(() => {
 		setLoading(true);
@@ -33,7 +33,7 @@ function MyApp({ Component, pageProps }: AppProps) {
         <clientContext.Provider value={{ client: client, setClient: setClient }}>
 		<Header/>
         <div className="wrapper">
-            <Component {...pageProps}>
+            <Component {...pageProps} clientLoading={loading}>
             </Component>
         </div>
         </clientContext.Provider>
diff --git a/src/pages/appointments/[id].tsx b/src/pages/appointments/[id].tsx
index f0da0d0..9543beb 100644
--- a/src/pages/appointments/[id].tsx
+++ b/src/pages/appointments/[id].tsx
@@ -51,7 +51,6 @@ const Patient: React.FC = () => {
     if (!extensions) return 'No details available';
     for (let i = 0; i < extensions.length; i++) {
       const extension = extensions?.[i];
-      // console.log(extension);
       if (extension.valueCodeableConcept?.coding) {
         for (let j = 0; j < extension.valueCodeableConcept.coding.length; j++) {
           const coding = extension.valueCodeableConcept?.coding?.[j];
@@ -81,6 +80,7 @@ if (!patient) {
   );
 }
 
+
 if(patient && appointments && encounters){
 
     return (
@@ -112,7 +112,7 @@ if(patient && appointments && encounters){
               <AppointmentsEncountersInfo title= "Appointments" onClose={handleCloseList}>
                 <ul className={styles.appointmentList}>
                   <div> 
-                    <ul className={styles.appointmentWrapper}>
+                    {appointments?.total && <ul className={styles.appointmentWrapper}>
                       {appointments?.entry?.map((entry) => {
                         const resource = entry.resource as R4.IAppointment;
                         const display = getDisplayFromExtensions(resource.extension); 
@@ -125,7 +125,8 @@ if(patient && appointments && encounters){
                         </li>
                       );
                     })}
-                    </ul>
+                    </ul>}
+                    {!appointments?.total && <p className="conditions-error">The patient has no appointments.</p>}
                   </div>
                 </ul>
               </AppointmentsEncountersInfo>
@@ -137,7 +138,7 @@ if(patient && appointments && encounters){
               <AppointmentsEncountersInfo title="Encounters" onClose={handleCloseList}>
                 <ul className={styles.encounterList}>
                 <div>
-                  <ul className={styles.appointmentWrapper}>
+                  {encounters?.total && <ul className={styles.appointmentWrapper}>
                     {encounters?.entry?.map((entry) => {
                       const resource = entry.resource as R4.IEncounter; 
                       return (
@@ -150,7 +151,8 @@ if(patient && appointments && encounters){
                         </li>
                       )
                     })}
-                  </ul>
+                  </ul>}
+                  {!encounters?.total && <p className="conditions-error">The patient has no encounters.</p>}
                 </div>
                 </ul>
               </AppointmentsEncountersInfo>
diff --git a/src/pages/documents/[id].tsx b/src/pages/documents/[id].tsx
index 63bb9fb..d9cc74d 100644
--- a/src/pages/documents/[id].tsx
+++ b/src/pages/documents/[id].tsx
@@ -104,8 +104,10 @@ const Documents: React.FC = () => {
     
     if(documents){
         if(documents.entry){
-            return (
-                <div className={styles.total}>
+            if(documents.total){
+
+                return (
+                    <div className={styles.total}>
                     <div className={styles.goBack}>
                     <PatientOverview patientId={patientId as string}/></div>
                     <div className={styles.metaDataBox}>
@@ -125,20 +127,26 @@ const Documents: React.FC = () => {
                             </p>
                         </div>
                     </div>
-                    {loading && 
+                    {(loading || !document) && currentDocumentID && !documentLoadError &&
                     <span className={loadingstyles.loader}>
                         <Spinner />
                     </span>}
-                    {loading == false && currentDocumentID && !documentLoadError &&
+                    {loading == false && currentDocumentID && !documentLoadError && document &&
                     <div className={styles.documentViewer}>
                         <iframe src={`data:application/pdf;base64,${document}`}/>
                     </div>}
-                    {!currentDocumentID && !loading && !documentLoadError &&
+                    {!currentDocumentID && !loading && !documentLoadError && documents.total > 0 &&
                     <div className={styles.documentInfo}>
                     <p>
                         Please select a document 
                     </p>
                     </div>}
+                    {!currentDocumentID && !loading && !documentLoadError && documents.total == 0 &&
+                    <div className={styles.documentInfo}>
+                    <p>
+                        There is no documents here
+                    </p>
+                    </div>}
                     {loading == false && currentDocumentID && documentLoadError &&
                     <div className={styles.documentError}>
                         <p>
@@ -155,16 +163,51 @@ const Documents: React.FC = () => {
                         
                     </div>
                     }
+                    
                 </div>
             )
+            }
+            else{
+                return (
+                <div className={styles.total}>
+                    <div className={styles.goBack}>
+                        <PatientOverview patientId={patientId as string}/>
+                    </div>
+                    <div className={styles.documentInfo}>
+                        <p>
+                            There is no documents here
+                        </p>
+                    </div>
+                </div>)
+            }
         }
         else{
-            return <></>
+            return (
+            <div className={styles.total}> 
+                <div className={styles.goBack}>
+                        <PatientOverview patientId={patientId as string}/>
+                </div>
+                <div className={styles.documentInfo}>
+                    <p>
+                        Could not get any documents assosiated with the patient
+                    </p>
+                </div>
+            </div>)
         }
-
+        
     }
     else if (!loading){
-        return <h1> Could not find documents related to {patientId}</h1>
+        return(
+            <div className={styles.total}> 
+                <div className={styles.goBack}>
+                        <PatientOverview patientId={patientId as string}/>
+                </div>
+                <div className={styles.documentInfo}>
+                    <p>
+                        Could not find documents related to {patientId}
+                    </p>
+                </div>
+            </div>) 
     }
     else if (loading){
         return (
diff --git a/src/pages/patient/[id].tsx b/src/pages/patient/[id].tsx
index 89f3754..7f0d421 100644
--- a/src/pages/patient/[id].tsx
+++ b/src/pages/patient/[id].tsx
@@ -12,7 +12,7 @@ const Patient: React.FC = () => {
   const [patient, setPatient] = useState<R4.IPatient | undefined>();
   const [documents, setDocuments] = useState<R4.IBundle | undefined>();
   const [conditions, setConditions] = useState<R4.IBundle | undefined>();
-  const [loading, setLoading] = useState<boolean>(false);
+  const [loading, setLoading] = useState<boolean>(true);
   const [appointments, setAppointments] = useState<R4.IBundle | undefined>(); 
   const [encounters, setEncounters] = useState<R4.IBundle | undefined>(); 
 
@@ -198,7 +198,6 @@ if(patient && !loading && documents && appointments && encounters){
 
 		return (
 			<div className="wrapper">
-				
 				<BlueInfoCard
 					icon="person-icon"
 					title={`${patient?.name![0].given} ${patient?.name![0].family}`}
diff --git a/src/pages/searchPatient.tsx b/src/pages/searchPatient.tsx
index 08d762f..02e5997 100644
--- a/src/pages/searchPatient.tsx
+++ b/src/pages/searchPatient.tsx
@@ -4,31 +4,25 @@ import { useRouter } from 'next/router'
 import styles from '../styles/searchPatient.module.scss';
 import Link from "next/link";
 
-import { R4 } from "@ahryman40k/ts-fhir-types";
-
 
 const ChoosePatient: React.FC<{ clientLoading: boolean }> = ({ clientLoading }) => {
 	const [patientId, setPatientId] = useState<string>("");
 	const { client } = useContext(clientContext);
 	const navigate = useRouter();
-    const [loading, setLoading] = useState<boolean>(false);
-
-
-	const renderEverything = (id: string) =>
-	{
-		navigate.push(`/patient/${id}`);
-	}
 
 
+	// Search for active patient if any patient is active
 	useEffect(() => {
 		if (client?.patient?.id) {
 			navigate.push(`/patient/${client.patient.id}`);
 		}
 	}, [client, navigate]);
 
+
+	// Search for patient on pressed enter key
 	const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
 		if (event.key === 'Enter') {
-			renderEverything(patientId)
+			navigate.push(`/patient/${patientId}`);
 		}
 	};
 
@@ -46,11 +40,11 @@ const ChoosePatient: React.FC<{ clientLoading: boolean }> = ({ clientLoading })
 							onKeyDown={(e) => handleKeyDown(e)}
 						/>
 					</div>
-						<Link href={{ pathname: `/patient/${patientId}`}} className="default-link">
-							<button className={styles.dipsPrimaryButton} >
-								Submit
-							</button>
-						</Link>
+					<Link href={{ pathname: `/patient/${patientId}`}} className="default-link">
+						<button className={styles.dipsPrimaryButton} >
+							Submit
+						</button>
+					</Link>
 				</div>
 			</div>
 		);
diff --git a/src/styles/appointment.module.scss b/src/styles/appointment.module.scss
index 830dbe4..7478497 100644
--- a/src/styles/appointment.module.scss
+++ b/src/styles/appointment.module.scss
@@ -8,7 +8,7 @@
 .appointmentList, .encounterList {
     list-style-type: none;
     padding: 0; 
-    height: calc(90vh - 100pt);
+    height: calc(80vh - 100pt);
     overflow-y: auto; 
 }
 
diff --git a/src/styles/conditions.scss b/src/styles/conditions.scss
index 70910be..9f4e46a 100644
--- a/src/styles/conditions.scss
+++ b/src/styles/conditions.scss
@@ -34,12 +34,10 @@
 }
 
 .conditions-list {
-    // max-height: 10%;
     padding: 0;
     margin: 0;
     list-style-type: none;
 
-    // height: 90%;
 
     overflow-y: scroll;
     scrollbar-width: thin;
diff --git a/src/styles/searchPatient.module.scss b/src/styles/searchPatient.module.scss
index 926315d..7644834 100644
--- a/src/styles/searchPatient.module.scss
+++ b/src/styles/searchPatient.module.scss
@@ -17,6 +17,7 @@
     border-color: $dips-dark-blue;
     border-style: solid;
     border-width: 2px;
+    background-color: white;
 }
 
 .inputLabel {
@@ -29,17 +30,19 @@
     color: #262626;
     width: 300px;
     height: 40px;
-    border: 1px solid #b6b7b9;
+    border: 1px solid $neutral-black;
     border-radius: 0.50rem;
     outline: none;
     font-size: 18px;
     font-family: 'CircularStd';
     margin-bottom: 40px;
     margin-top: 15px;
-}
+    background-color: whitesmoke;
 
-.inputField input:focus {
-    border-color: $dips-primary-blue;
+    &:focus {
+        background-color: white;
+        border: 1px solid $dips-primary-blue;
+    }
 }
 
 .dipsPrimaryButton {