diff --git a/docker-compose.yml b/docker-compose.yml
index f06475c127..18ecc1fe85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
             
     fhir.openelis.org:
         container_name: external-fhir-api
-        image: hapiproject/hapi:v6.6.0-tomcat
+        image: itechuw/openelis-global-2-fhir:develop
         depends_on:
             - database
             - certs
@@ -106,7 +106,7 @@ services:
         tty: true
 
     proxy:
-        image: nginx:1.15-alpine
+        image: itechuw/openelis-global-2-proxy:develop
         container_name: openelisglobal-proxy
         ports:
             - 80:80
diff --git a/frontend/cypress/e2e/dashboard.cy.js b/frontend/cypress/e2e/dashboard.cy.js
index dad22382e6..52bdb1855d 100644
--- a/frontend/cypress/e2e/dashboard.cy.js
+++ b/frontend/cypress/e2e/dashboard.cy.js
@@ -38,7 +38,7 @@ describe("Pathology Dashboard", function () {
 
   it("Validate the Status of Order", () => {
     cy.fixture("DashBoard").then((order) => {
-    //  dashboard.validateOrderStatus(order.labNo, 4);
+      //  dashboard.validateOrderStatus(order.labNo, 4);
     });
   });
 });
diff --git a/frontend/src/components/admin/reflexTests/ReflexStyles.css b/frontend/src/components/admin/reflexTests/ReflexStyles.css
index 3d96e7aaea..20fa3226e6 100644
--- a/frontend/src/components/admin/reflexTests/ReflexStyles.css
+++ b/frontend/src/components/admin/reflexTests/ReflexStyles.css
@@ -28,10 +28,15 @@ body {
   padding-left: 0px;
   width: 100%;
   z-index: 10;
-  position: relative;
+  position: absolute;
   background-color: #ffffff;
 }
 
+.suggestions-container {
+  position: relative;
+  width: 100%;
+}
+
 .suggestions li {
   padding: 0.5rem;
   z-index: 99 !important;
diff --git a/frontend/src/components/common/AutoComplete.js b/frontend/src/components/common/AutoComplete.js
index 5680a7312a..1cb61892d2 100644
--- a/frontend/src/components/common/AutoComplete.js
+++ b/frontend/src/components/common/AutoComplete.js
@@ -88,24 +88,26 @@ function AutoComplete(props) {
   if (showSuggestions && userInput) {
     if (filteredSuggestions.length) {
       suggestionsListComponent = (
-        <ul className="suggestions">
-          {filteredSuggestions.map((suggestion, index) => {
-            let className;
-            // Flag the active suggestion with a class
-            if (index === activeSuggestion) {
-              className = "suggestion-active";
-            }
-            return (
-              <li
-                className={className}
-                key={index}
-                onClick={(e) => onClick(e, suggestion.id, suggestion)}
-              >
-                {suggestion.value}
-              </li>
-            );
-          })}
-        </ul>
+        <div className="suggestions-container">
+          <ul className="suggestions">
+            {filteredSuggestions.map((suggestion, index) => {
+              let className;
+              // Flag the active suggestion with a class
+              if (index === activeSuggestion) {
+                className = "suggestion-active";
+              }
+              return (
+                <li
+                  className={className}
+                  key={index}
+                  onClick={(e) => onClick(e, suggestion.id, suggestion)}
+                >
+                  {suggestion.value}
+                </li>
+              );
+            })}
+          </ul>
+        </div>
       );
     } else {
       suggestionsListComponent = (