diff --git a/pages/applications/[app_id].jsx b/pages/applications/[app_id].jsx
index 95f81530..6a3dafa6 100644
--- a/pages/applications/[app_id].jsx
+++ b/pages/applications/[app_id].jsx
@@ -17,15 +17,25 @@ import dynamic from 'next/dynamic'
 import { applicationsData } from "../../components/airview-compliance-ui/stories/compliance-table/applications-data";
 import { groups, controls, resources } from "../../components/airview-compliance-ui/stories/control-overview/data";
 ///
+import { MiniStatisticsCard } from "../../components/dashboard";
+import { Stack } from '@mui/material'
+import { Chip } from '@mui/material'
+import Accordion from '@mui/material/Accordion';
+import AccordionSummary from '@mui/material/AccordionSummary';
+import AccordionDetails from '@mui/material/AccordionDetails';
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 
 export default dynamic(() => Promise.resolve(Page), {
-    ssr: false,
-  });
+  ssr: false,
+});
 
-function Page({app}) {
-    const topBarHeight = 64;
+function Page({ app }) {
+  const topBarHeight = 64;
+  console.log('Page:app: ', app)
+  let data_classification = '';
+  let tier = '';
 
-    const noDataMessage={
+  const noDataMessage = {
     title: "No issues",
     message: "There are no issues to display for this application",
   };
@@ -34,130 +44,207 @@ function Page({app}) {
     message: "You do not have the required permissions to view the data for this application",
   };
 
-    return (
-        <ThemeProvider theme={theme}>
-            <CssBaseline />
-            <Topbar menu={false} topBarHeight={topBarHeight} logo={true} />
-            <div style={{ marginTop: topBarHeight, paddingLeft: 0, }}
-            ><Box sx={{ px: '5%' }}>
-                    {app && app.name && <Typography variant="h1" component="h1">{app.name}</Typography>}
-                    {app && app.description && <Typography variant="h4" color='text.highlight'>{app.description}</Typography>}
-                    {/* <Container maxWidth="lg" sx={{ height: '100vh' }}> */}
-                    <Grid container spacing={4} alignItems="stretch">
-                        <Grid item xs={3} md={3} sx={{ mb: '20px' }}>
-                        </Grid>
-                    </Grid>
-
-                    <ComplianceTable title="Issues" noDataMessage={noDataMessage} invalidPermissionsMessage={invalidPermissionsMessage} loading={false} applications={applicationsData} />;
-                    <ApplicationControls/>
-                    {/* </Container> */}
-                </Box>
-            </div>
-        </ThemeProvider>
-    )
+  return (
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
+      <Topbar menu={false} topBarHeight={topBarHeight} logo={true} />
+      <div style={{ marginTop: topBarHeight, paddingLeft: 0, }}
+      ><Box sx={{ px: '5%' }}>
+
+          <Grid container spacing={4} alignItems="center" justifyContent="left">
+            {app && app.name && <Grid item xs={3} md={3}><Typography variant="h1" component="h1">{app.name}</Typography></Grid>}
+            {app.app_id && <Grid item xs={3} md={3}><Typography variant="h5">Application ID: {app.app_id}</Typography></Grid>}
+            <Grid item xs={3} md={3}>
+            <Stack direction="row" spacing={1} sx={{ pt: '2%' }}>
+            {app.data_classification === 'Public' && <Chip label="Data: Public" color="success" />}
+            {app.data_classification === 'Restricted' && <Chip label="Data: Restricted" color="warning" />}
+            {app.data_classification === 'Highly Restricted' && <Chip label="Data: Highly Restricted" color="error" />}
+            {app.tier && <Chip label={`Tier ${app.tier}`} variant="outlined" />}
+
+          </Stack>
+</Grid>
+          </Grid>
+          {app && app.description && <Typography variant="h4" color='text.highlight'>{app.description}</Typography>}
+         
+          <Grid container spacing={4} alignItems="stretch" sx={{ pt: '2%' }} justifyContent="center">
+            <Grid item xs={3} md={3} sx={{ mb: '20px' }}>
+              <MiniStatisticsCard
+                color="text.highlight"
+                title="Controls"
+                count="132"
+                percentage={{ value: '55%', text: "coverage" }}
+                icon={{ color: "error", icon: 'check' }}
+              />
+            </Grid>
+            <Grid item xs={3} md={3} sx={{ mb: '20px' }}>
+              <MiniStatisticsCard
+                color="text.highlight"
+                title="Sev 1"
+                count="1"
+                percentage={{ value: '', text: "non-compliances" }}
+                icon={{ color: "warning", icon: 'triangle-exclamation' }}
+              />
+            </Grid>
+            <Grid item xs={3} md={3} sx={{ mb: '20px' }}>
+              <MiniStatisticsCard
+                color="text.highlight"
+                title="Sev 2"
+                count="3"
+                percentage={{ value: '', text: "non-compliances" }}
+                icon={{ color: "error", icon: 'circle-exclamation' }}
+              />
+            </Grid>
+            <Grid item xs={3} md={3} sx={{ mb: '20px' }}>
+              <MiniStatisticsCard
+                color="text.highlight"
+                title="Sev 3"
+                count="34"
+                percentage={{ value: '', text: "non-compliances" }}
+                icon={{ color: "error", icon: 'info' }}
+              />
+            </Grid>
+          </Grid>
+
+
+          <Grid container spacing={4} alignItems="stretch">
+            <Grid item xs={3} md={3} sx={{ mb: '20px' }}>
+            </Grid>
+          </Grid>
+
+          <Accordion>
+            <AccordionSummary
+              expandIcon={<ExpandMoreIcon />}
+              aria-controls="panel1a-content"
+              id="panel1a-header"
+            >
+              <Typography sx={{ width: '50%', flexShrink: 0 }}>Issues and Exemptions</Typography><Chip label="5 exemptions" variant="outlined" sx={{ml:'auto'}}/><Chip label="37" color="error" sx={{ml:'auto', mr: '5%'}}/>
+            </AccordionSummary>
+            <AccordionDetails>
+            <ComplianceTable title="Issues" noDataMessage={noDataMessage} invalidPermissionsMessage={invalidPermissionsMessage} loading={false} applications={applicationsData} />;
+            </AccordionDetails>
+          </Accordion>
+          <Accordion>
+            <AccordionSummary
+              expandIcon={<ExpandMoreIcon />}
+              aria-controls="panel1a-content"
+              id="panel1a-header"
+            >
+              <Typography>Controls</Typography>
+            </AccordionSummary>
+            <AccordionDetails>
+            <ApplicationControls />
+            </AccordionDetails>
+          </Accordion>
+
+         
+          
+          {/* </Container> */}
+        </Box>
+      </div>
+    </ThemeProvider>
+  )
 }
 
 
 export async function getStaticPaths() {
-    let pages = [];
-    let location = 'services';
-    try {
-        const apps = await getApplications()
-        const pages = apps.map((file) => {
-            return '/applications/' + file.app_id
-        })
-        return {
-            fallback: true,
-            paths: pages
-        }
-    } catch (error) {
-        console.error(error)
-        return {
-            fallback: true,
-            paths: pages
-        }
+  let pages = [];
+  let location = 'services';
+  try {
+    const apps = await getApplications()
+    const pages = apps.map((file) => {
+      return '/applications/' + file.app_id
+    })
+    return {
+      fallback: true,
+      paths: pages
+    }
+  } catch (error) {
+    console.error(error)
+    return {
+      fallback: true,
+      paths: pages
     }
+  }
 
 
 }
 export async function getStaticProps(context) {
-    try {
-        const app = await getApplicationById(context.params.app_id);
-        return {
-            props: {
-                app: app
-            },
-        };
-    } catch (error) {
-        console.error(error);
-        return {
-            props: {
-                app: {}
-            },
-        };
-    }
+  try {
+    const app = await getApplicationById(context.params.app_id);
+    return {
+      props: {
+        app: app
+      },
+    };
+  } catch (error) {
+    console.error(error);
+    return {
+      props: {
+        app: {}
+      },
+    };
+  }
 }
 
 
 const ApplicationControls = () => {
-    const [state, setControlsData, setResourcesData] =
-      useControlOverviewController(() => {
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            resolve(groups);
-          }, [500]);
-        });
-      }, 1);
-  
-    const handleOnRequestOfControlsData = (id) => {
-      setControlsData(id, () => {
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            if (id === 3) resolve("error");
-  
-            resolve(controls[id]);
-          }, [500]);
-        });
-      });
-    };
-  
-    const handleOnRequestOfResourcesData = (id) => {
-      setResourcesData(id, () => {
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            if (id === 3) resolve("error");
-  
-            resolve(resources[id]);
-          }, [500]);
-        });
+  const [state, setControlsData, setResourcesData] =
+    useControlOverviewController(() => {
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve(groups);
+        }, [500]);
       });
-    };
-  
-    const handleOnResourceExemptionDelete = () => {
+    }, 1);
+
+  const handleOnRequestOfControlsData = (id) => {
+    setControlsData(id, () => {
       return new Promise((resolve) => {
         setTimeout(() => {
-          resolve();
-        }, [1000]);
+          if (id === 3) resolve("error");
+
+          resolve(controls[id]);
+        }, [500]);
       });
-    };
-  
-    const handleOnResourceExemptionSave = () => {
+    });
+  };
+
+  const handleOnRequestOfResourcesData = (id) => {
+    setResourcesData(id, () => {
       return new Promise((resolve) => {
         setTimeout(() => {
-          resolve();
-        }, [1000]);
+          if (id === 3) resolve("error");
+
+          resolve(resources[id]);
+        }, [500]);
       });
-    };
-  
-    return (
-      <ControlOverview
-        title="Control Overview"
-        data={state}
-        onRequestOfControlsData={handleOnRequestOfControlsData}
-        onRequestOfResourcesData={handleOnRequestOfResourcesData}
-        onResourceExemptionDelete={handleOnResourceExemptionDelete}
-        onResourceExemptionSave={handleOnResourceExemptionSave}
-      />
-    );
+    });
+  };
+
+  const handleOnResourceExemptionDelete = () => {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve();
+      }, [1000]);
+    });
   };
-  
\ No newline at end of file
+
+  const handleOnResourceExemptionSave = () => {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve();
+      }, [1000]);
+    });
+  };
+
+  return (
+    <ControlOverview
+      title="Control Overview"
+      data={state}
+      onRequestOfControlsData={handleOnRequestOfControlsData}
+      onRequestOfResourcesData={handleOnRequestOfResourcesData}
+      onResourceExemptionDelete={handleOnResourceExemptionDelete}
+      onResourceExemptionSave={handleOnResourceExemptionSave}
+    />
+  );
+};