diff --git a/Frontend/patient_manager/lib/components/builders/buildFilesList.dart b/Frontend/patient_manager/lib/components/builders/buildFilesList.dart
index bfab19c6..96db2cd6 100644
--- a/Frontend/patient_manager/lib/components/builders/buildFilesList.dart
+++ b/Frontend/patient_manager/lib/components/builders/buildFilesList.dart
@@ -303,7 +303,7 @@ class _BuildFilesListState extends State<BuildFilesList> {
     double height = size.height;
     if (widget.files.isNotEmpty) {
       return SizedBox(
-        height: height - 254,
+        height: height - 177,
         child: ListView.separated(
           shrinkWrap: true,
           separatorBuilder: (BuildContext context, int index) {
@@ -353,7 +353,7 @@ class _BuildFilesListState extends State<BuildFilesList> {
       );
     } else {
       return SizedBox(
-        height: height - 250,
+        height: height - 150,
         child: const Center(
           child: Text(
             "No Documents Available",
diff --git a/Frontend/patient_manager/lib/components/builders/buildNotesList.dart b/Frontend/patient_manager/lib/components/builders/buildNotesList.dart
index c9a8a367..a203ee89 100644
--- a/Frontend/patient_manager/lib/components/builders/buildNotesList.dart
+++ b/Frontend/patient_manager/lib/components/builders/buildNotesList.dart
@@ -280,7 +280,7 @@ class _BuildNotesListState extends State<BuildNotesList> {
     double height = size.height;
     if (widget.notes.isNotEmpty) {
       return SizedBox(
-        height: height - 250,
+        height: height - 173,
         child: ListView.separated(
           shrinkWrap: true,
           separatorBuilder: (BuildContext context, int index) {
@@ -322,7 +322,7 @@ class _BuildNotesListState extends State<BuildNotesList> {
       );
     } else {
       return SizedBox(
-        height: height - 250,
+        height: height - 173,
         child: const Center(
           child: Text(
             "No Notes Available",
diff --git a/Frontend/patient_manager/lib/components/patientDetails.dart b/Frontend/patient_manager/lib/components/patientDetails.dart
index a3088396..76e461d9 100644
--- a/Frontend/patient_manager/lib/components/patientDetails.dart
+++ b/Frontend/patient_manager/lib/components/patientDetails.dart
@@ -274,7 +274,7 @@ class _PatientDetailsState extends State<PatientDetails> {
     double height = size.height;
     return Container(
       alignment: Alignment.topCenter,
-      height: height - 177,
+      height: height - 100,
       padding: const EdgeInsets.only(left: 10, right: 10, bottom: 10),
       decoration: BoxDecoration(
         color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
diff --git a/Frontend/patient_manager/lib/components/patientFiles.dart b/Frontend/patient_manager/lib/components/patientFiles.dart
index 1418433e..585a24bf 100644
--- a/Frontend/patient_manager/lib/components/patientFiles.dart
+++ b/Frontend/patient_manager/lib/components/patientFiles.dart
@@ -651,7 +651,7 @@ class _PatientFilesState extends State<PatientFiles> {
       builder: (context, snapshot) {
         if (snapshot.connectionState == ConnectionState.waiting) {
           return Container(
-            height: height - 177,
+            height: height - 100,
             decoration: BoxDecoration(
               color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               borderRadius: BorderRadius.circular(25.0),
@@ -703,7 +703,7 @@ class _PatientFilesState extends State<PatientFiles> {
           );
         } else {
           return Container(
-            height: height - 177,
+            height: height - 175,
             decoration: BoxDecoration(
               color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               borderRadius: BorderRadius.circular(25.0),
diff --git a/Frontend/patient_manager/lib/components/patientNotes.dart b/Frontend/patient_manager/lib/components/patientNotes.dart
index 58765f5c..0e2d8318 100644
--- a/Frontend/patient_manager/lib/components/patientNotes.dart
+++ b/Frontend/patient_manager/lib/components/patientNotes.dart
@@ -339,7 +339,7 @@ class _PatientNotesState extends State<PatientNotes> {
       builder: (context, snapshot) {
         if (snapshot.connectionState == ConnectionState.waiting) {
           return Container(
-            height: height - 177,
+            height: height - 100,
             decoration: BoxDecoration(
               color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               borderRadius: BorderRadius.circular(25.0),
@@ -391,7 +391,7 @@ class _PatientNotesState extends State<PatientNotes> {
           );
         } else {
           return Container(
-            height: height - 177,
+            height: height - 100,
             decoration: BoxDecoration(
               color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
               borderRadius: BorderRadius.circular(25.0),
diff --git a/Frontend/patient_manager/lib/pages/patientAccessReview.dart b/Frontend/patient_manager/lib/pages/patientAccessReview.dart
index 346f6ec3..aeaae519 100644
--- a/Frontend/patient_manager/lib/pages/patientAccessReview.dart
+++ b/Frontend/patient_manager/lib/pages/patientAccessReview.dart
@@ -126,7 +126,7 @@ class _PatientAccessRequestState extends State<PatientAccessRequest> {
       padding: const EdgeInsets.all(15.0),
       child: SizedBox(
         width: w,
-        height: h - 105,
+        height: h,
         child: Column(mainAxisSize: MainAxisSize.max, children: [
           //const SizedBox(height: 15),
           const Text(
diff --git a/Frontend/patient_manager/lib/pages/patientView.dart b/Frontend/patient_manager/lib/pages/patientView.dart
index c5587e35..2c40cb34 100644
--- a/Frontend/patient_manager/lib/pages/patientView.dart
+++ b/Frontend/patient_manager/lib/pages/patientView.dart
@@ -5,6 +5,7 @@ import 'package:patient_manager/components/patientDetails.dart';
 import 'package:patient_manager/components/patientFiles.dart';
 import 'package:patient_manager/components/patientNotes.dart';
 import 'package:patient_manager/env/env.dart';
+import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/arguments.dart';
 import 'package:patient_manager/objects/patients.dart';
 import 'package:supertokens_flutter/http.dart' as http;
@@ -23,6 +24,16 @@ class PatientView extends StatefulWidget {
 
 class _PatientViewState extends State<PatientView> {
   int _selectedIndex = 0;
+  late double popUpWidth;
+  late double? popUpheight;
+  late double popUpTitleSize;
+  late double popUpSubtitleSize;
+  late double popUpBodySize;
+  late double popUpIconSize;
+  late double popUpPaddingSize;
+  late double width;
+  late double height;
+
   Future<Patient?> fetchPatient() async {
     //print("Patien manager page: $endpoint");
     var patientAppId = widget.arguments.selectedPatient!.app_id;
@@ -47,6 +58,20 @@ class _PatientViewState extends State<PatientView> {
     return null;
   }
 
+  void checkScreenSize() {
+    if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") {
+      setState(() {
+        popUpWidth = (width / 4) * 2;
+        popUpheight = null;
+      });
+    } else {
+      setState(() {
+        popUpWidth = width - (width * 0.1);
+        popUpheight = null;
+      });
+    }
+  }
+
   Widget showSelection(int index) {
     if (index == 0) {
       return PatientDetails(
@@ -83,22 +108,24 @@ class _PatientViewState extends State<PatientView> {
 
   @override
   Widget build(BuildContext context) {
-    // loadImage();
-    // var logo = MzanziInnovationHub.of(context)!.theme.logoImage();
+    var size = MediaQuery.of(context).size;
+    setState(() {
+      width = size.width;
+      height = size.height;
+    });
+    checkScreenSize();
     return Scaffold(
-      // appBar: const MIHAppBar(
-      //   barTitle: "Patient Profile",
-      //   propicFile: null,
-      // ),
-      //drawer: showDrawer(),
       body: SafeArea(
         child: SingleChildScrollView(
           child: Stack(
             children: [
-              Padding(
+              Container(
+                width: width,
+                height: height,
                 padding: const EdgeInsets.symmetric(
                     vertical: 10.0, horizontal: 15.0),
                 child: Column(
+                  mainAxisSize: MainAxisSize.max,
                   children: [
                     Row(
                       crossAxisAlignment: CrossAxisAlignment.end,
@@ -140,7 +167,7 @@ class _PatientViewState extends State<PatientView> {
                       ],
                     ),
                     const SizedBox(
-                      height: 25.0,
+                      height: 10.0,
                     ),
                     showSelection(_selectedIndex),
                   ],