diff --git a/components/filters/CustomDatePicker.tsx b/components/filters/CustomDatePicker.tsx
index d9657b9892..667078bc8f 100644
--- a/components/filters/CustomDatePicker.tsx
+++ b/components/filters/CustomDatePicker.tsx
@@ -23,7 +23,7 @@ export const CustomDatePicker = () => {
   const nextMonth = startOfMonth(now.add({ months: 1 }));
 
   return (
-    <div className="flex flex-col gap-4 w-full">
+    <div className="flex flex-col md:gap-2 w-full">
       <DatePicker
         CalendarBottomContent={<div className="min-w-[380px]"></div>}
         CalendarTopContent={
@@ -55,7 +55,7 @@ export const CustomDatePicker = () => {
         size="sm"
         variant="flat"
       />
-      <p className="text-default-500 text-sm">
+      <p className="hidden md:flex text-default-500 text-sm">
         Selected date:{" "}
         {value ? formatter.format(value.toDate(getLocalTimeZone())) : "--"}
       </p>
diff --git a/components/filters/FilterControls.tsx b/components/filters/FilterControls.tsx
index a3ed124159..cd9b5654bc 100644
--- a/components/filters/FilterControls.tsx
+++ b/components/filters/FilterControls.tsx
@@ -4,7 +4,7 @@ import { CustomSelectProvider } from "./CustomSelectProvider";
 
 export const FilterControls = () => {
   return (
-    <div className="grid grid-cols-1 md:grid-cols-4 gap-x-4">
+    <div className="grid grid-cols-1 md:grid-cols-4 gap-x-4 gap-y-4">
       <CustomSelectProvider />
       <CustomDatePicker />
       <CustomAccountSelection />
diff --git a/components/icons/services/IconServices.tsx b/components/icons/services/IconServices.tsx
index 2fd943604e..2678b3ef7a 100644
--- a/components/icons/services/IconServices.tsx
+++ b/components/icons/services/IconServices.tsx
@@ -895,7 +895,7 @@ export const getAWSIcon = (serviceAlias: string) => {
       return <AWSCloudWatchIcon />;
     case "AWS Config":
       return <AWSConfigIcon />;
-    case "AWS Database Migration Service":
+    case "AWS Database Migration":
       return <AWSDatabaseMigrationServiceIcon />;
     case "AWS Glue":
       return <AWSGlueIcon />;
@@ -911,7 +911,7 @@ export const getAWSIcon = (serviceAlias: string) => {
       return <AWSResourceExplorerIcon />;
     case "AWS Security Hub":
       return <AWSSecurityHubIcon />;
-    case "AWS Systems Manager Incident Manager":
+    case "AWS Systems Manager":
       return <AWSSystemsManagerIncidentManagerIcon />;
     case "AWS Trusted Advisor":
       return <AWSTrustedAdvisorIcon />;
diff --git a/components/services/CardService.tsx b/components/services/CardService.tsx
index eaae8dc450..6216217607 100644
--- a/components/services/CardService.tsx
+++ b/components/services/CardService.tsx
@@ -12,15 +12,17 @@ export const CardService: React.FC<CardServiceProps> = ({
 }) => {
   return (
     <Card fullWidth isPressable isHoverable shadow="sm">
-      <CardBody className="flex flex-row items-center space-x-4">
-        {getAWSIcon(serviceAlias)}
-        <div className="flex flex-col">
-          <h4 className="font-bold text-large">{serviceAlias}</h4>
-          <small className="text-default-500">
-            {fidingsFailed > 0
-              ? `${fidingsFailed} Failed Findings`
-              : "All findings passed"}
-          </small>
+      <CardBody className="flex flex-row items-center space-x-4 justify-between">
+        <div className="flex space-x-4 items-center">
+          {getAWSIcon(serviceAlias)}
+          <div className="flex flex-col">
+            <h4 className="font-bold text-large">{serviceAlias}</h4>
+            <small className="text-default-500">
+              {fidingsFailed > 0
+                ? `${fidingsFailed} Failed Findings`
+                : "All findings passed"}
+            </small>
+          </div>
         </div>
 
         <Chip
diff --git a/dataServices.json b/dataServices.json
index cfda95d520..1792537598 100644
--- a/dataServices.json
+++ b/dataServices.json
@@ -303,7 +303,7 @@
         "updated_at": "2024-08-14T10:17:00.000000Z",
         "provider": "aws",
         "provider_id": "018",
-        "alias": "AWS Database Migration Service",
+        "alias": "AWS Database Migration",
         "regions": ["us-east-1", "us-east-2"],
         "findings": {
           "failed": 5,
@@ -439,7 +439,7 @@
         "updated_at": "2024-08-14T10:25:00.000000Z",
         "provider": "aws",
         "provider_id": "026",
-        "alias": "AWS Systems Manager Incident Manager",
+        "alias": "AWS Systems Manager",
         "regions": ["eu-west-1", "eu-west-3"],
         "findings": {
           "failed": 0,