diff --git a/CoVAR-app/src/app/(pages)/dashboard/page.tsx b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
index dea07ab..5888439 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/page.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
@@ -316,13 +316,13 @@ const Dashboard: React.FC = () => {
                         <ReportsPerClient reportsPerClient={reportsPerClient} />
                     )}
                 </Paper>
-                <Paper elevation={3} sx={{ padding: 2, marginBottom: 2 }}>
                     {users.length === 0 && organizations.length === 0 ? (
                         <Typography>No assigned clients or organisations found.</Typography>
                     ) : (
                         <List>
-                            {users.map((user) => (
-                                <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
+                        {users.map((user) => (
+                            <Paper key={user.user_id} sx={{ padding: 1, marginBottom: 2 }}>
+                                <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1 }}>
                                     <ListItemText
                                         primary={`User: ${user.username}`}
                                         secondary={`Last Report: ${formatDate(lastReportDatesClients.find(c => c.client_name === user.username)?.last_report_date as string) || 'No report'}`}
@@ -333,12 +333,14 @@ const Dashboard: React.FC = () => {
                                         </Button>
                                     </ListItemSecondaryAction>
                                 </ListItem>
-                            ))}
-                            {organizations.map((org) => (
-                                <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
+                            </Paper>
+                        ))}
+                        {organizations.map((org) => (
+                            <Paper key={org.organization_id} sx={{ padding: 1, marginBottom: 2 }}>
+                                <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1 }}>
                                     <ListItemText
                                         primary={`Organisation: ${org.name}`}
-                                        secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report'}`}
+                                        secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report' }`}
                                     />
                                     <ListItemSecondaryAction>
                                         <Button variant="contained" onClick={() => handleOrganizationButtonClick(org)}>
@@ -346,10 +348,11 @@ const Dashboard: React.FC = () => {
                                         </Button>
                                     </ListItemSecondaryAction>
                                 </ListItem>
-                            ))}
-                        </List>
+                            </Paper>
+                        ))}
+                    </List>
+
                     )}
-                </Paper>
             </Box>
         );
     }
diff --git a/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx
index 37bb746..53dc88f 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx
@@ -745,6 +745,7 @@ const UserConflicts = () => {
                 alignItems: 'center',
                 width: '100%',
                 height: '100%',
+                
 
             }}>
                 <Loader />
@@ -756,7 +757,21 @@ const UserConflicts = () => {
 
     return (
 
-        <ReportsContainer sx={mainContentStyles} id="reportsContainer">
+        <ReportsContainer sx={{... mainContentStyles, 
+            overflowY: 'auto',
+            '&::-webkit-scrollbar': {
+                width: '0.2vw', 
+            },
+            '&::-webkit-scrollbar-thumb': {
+                backgroundColor: 'gray', 
+                borderRadius: '0.4vw',
+            },
+            '&::-webkit-scrollbar-track': {
+                backgroundColor: 'transparent', 
+            },
+            scrollbarWidth: 'thin', 
+            scrollbarColor: 'gray transparent', 
+        }} id="reportsContainer">
             {matchedReports.length > 0 && (
                 <Box>
                     {renderedMatchedReports}
diff --git a/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx
index ab045cd..526b2f3 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx
@@ -47,7 +47,7 @@ const OrganizationEvaluation: React.FC = () => {
   }, [router]);
 
   const pathname = usePathname();
-  const organizationName = pathname.split('/').pop();
+  const organizationName = decodeURIComponent(pathname.split('/').pop() || '');
 
   const [uploads, setUploads] = useState<FileUpload[]>([]);
   const [reportIds, setReportIds] = useState<number[]>([]);
@@ -238,7 +238,22 @@ const OrganizationEvaluation: React.FC = () => {
           </Paper>
         </Grid>
         <Grid item xs={6}>
-          <Paper sx={{ overflowY: 'scroll', height: 'calc(80vh + 16px)' }}>
+          <Paper sx={{ 
+            overflowY: 'scroll', 
+            height: 'calc(80vh + 16px)',
+            '&::-webkit-scrollbar': {
+                width: '0.2vw', 
+            },
+            '&::-webkit-scrollbar-thumb': {
+                backgroundColor: 'gray', 
+                borderRadius: '0.4vw',
+            },
+            '&::-webkit-scrollbar-track': {
+                backgroundColor: 'transparent', 
+            },
+            scrollbarWidth: 'thin', 
+            scrollbarColor: 'gray transparent', 
+            }}>
 
             <ReportPreview reports={reports.slice(0, 3)} reportIds={reportIds} client={organizationName ?? ''} reportNames={reportNames} />
 
diff --git a/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx
index 20c39cb..8892d90 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx
@@ -222,7 +222,24 @@ const UserEvaluation: React.FC = () => {
           </Paper>
         </Grid>
         <Grid item xs={6}>
-          <Paper sx={{ overflowY: 'scroll', height: 'calc(80vh + 16px)' }}>
+          <Paper sx={{ 
+            overflowY: 'scroll', 
+            height: 'calc(80vh + 16px)',
+            '&::-webkit-scrollbar': {
+                width: '0.2vw', 
+            },
+            '&::-webkit-scrollbar-thumb': {
+                backgroundColor: 'gray', 
+                borderRadius: '0.4vw',
+            },
+            '&::-webkit-scrollbar-track': {
+                backgroundColor: 'transparent', 
+            },
+            scrollbarWidth: 'thin', 
+            scrollbarColor: 'gray transparent', 
+
+
+          }}>
 
             <ReportPreview reports={reports} reportIds={reportIds} client={username ?? ''} reportNames={reportNames} />
 
diff --git a/CoVAR-app/src/functions/requests.tsx b/CoVAR-app/src/functions/requests.tsx
index 34f71c7..45b823c 100644
--- a/CoVAR-app/src/functions/requests.tsx
+++ b/CoVAR-app/src/functions/requests.tsx
@@ -518,8 +518,8 @@ export const fetchAndMatchReports = async (reportIds: number[]) => {
 export const generateReportRequest = async (finalReport: any[], name: string | undefined, type: string | null) => {
     try {
         const token = localStorage.getItem('accessToken');
-
-
+        name = decodeURIComponent(name || '');
+        console.log(name)
         const request: AxiosRequestConfig = {
             method: 'post',
             url: '/api/uploads/generateReport',
diff --git a/server/routes/uploads.js b/server/routes/uploads.js
index 0e9e023..d88c5d2 100644
--- a/server/routes/uploads.js
+++ b/server/routes/uploads.js
@@ -390,6 +390,7 @@ router.get('/uploads/client/:clientName', authenticateToken, async (req, res) =>
 // Endpoint to generate report
 router.post('/uploads/generateReport', authenticateToken, async (req, res) => {
     const { finalReport, name, type } = req.body;
+    console.log("finalReport:",finalReport, "name:", name, "type:", type);
 
     if (!finalReport || finalReport.length === 0) {
         return res.status(400).json({ error: 'Reports or report IDs are missing' });