diff --git a/GRATITUDE_API.md b/GRATITUDE_API.md
new file mode 100644
index 0000000..a77b922
--- /dev/null
+++ b/GRATITUDE_API.md
@@ -0,0 +1,208 @@
+# Gratitude API
+
+## Overview
+
+The Gratitude feature allows users to send appreciation messages to others when marking actions as completed. This functionality enhances the collaborative nature of the application by enabling users to acknowledge contributions and express thanks to colleagues, managers, or team members.
+
+## API Endpoints
+
+### 1. Send Gratitude Email Endpoint
+
+- **URL**: `/api/gratitude/send`
+- **Method**: POST
+- **Content-Type**: application/json
+- **Credentials**: include
+- **Request Body**:
+  ```json
+  {
+    "statementId": "string", // ID of the statement containing the action
+    "actionId": "string", // ID of the specific action
+    "message": "string", // The gratitude message to send
+    "recipientEmail": "string", // Email address of the recipient
+    "recipientName": "string" // Optional name of the recipient
+  }
+  ```
+- **Expected Response**:
+
+  - Success:
+    ```json
+    {
+      "success": true,
+      "message": "Gratitude email sent successfully",
+      "id": "string" // Unique ID for the sent message (for tracking)
+    }
+    ```
+  - Error:
+    ```json
+    {
+      "success": false,
+      "message": "Error description"
+    }
+    ```
+
+- **Backend Behavior**:
+  - Validate all inputs, especially the email format
+  - Compose an email using an appropriate template
+  - Include the gratitude message in the email
+  - Send the email to the recipient
+  - Return success confirmation with a unique ID
+  - Handle failures gracefully with meaningful error messages
+
+### 2. Mark Gratitude Sent Endpoint
+
+- **URL**: `/api/gratitude/mark/{statementId}/{actionId}`
+- **Method**: POST
+- **Content-Type**: application/json
+- **Credentials**: include
+- **URL Parameters**:
+  - `statementId`: The ID of the statement
+  - `actionId`: The ID of the action
+- **Request Body**:
+  ```json
+  {
+    "message": "string" // The gratitude message that was sent
+  }
+  ```
+- **Expected Response**:
+
+  - Success: Return the updated Action object:
+    ```json
+    {
+      "id": "string", // Action ID
+      "creationDate": "string", // ISO date string
+      "byDate": "string", // ISO date string (can be empty)
+      "action": "string", // Action text
+      "completed": true, // Should be true for gratitude to be sent
+      "gratitudeSent": true, // Must be set to true
+      "gratitudeMessage": "string", // The message that was sent
+      "gratitudeSentDate": "string" // Current timestamp in ISO format
+    }
+    ```
+  - Error:
+    ```json
+    {
+      "success": false,
+      "message": "Error description"
+    }
+    ```
+
+- **Backend Behavior**:
+  - Verify the statement and action exist
+  - Update the action record with gratitude information
+  - Set the `gratitudeSent` flag to true
+  - Store the gratitude message
+  - Record the current timestamp as the sent date
+  - Return the complete updated action object
+
+## Feature Flow
+
+The Gratitude feature flow in the LIFT frontend consists of the following steps:
+
+1. **Initiating Gratitude**
+
+   - User completes an action
+   - User clicks the dropdown menu for the action
+   - User selects "Send gratitude" option
+   - System displays the GratitudeModal
+
+2. **Composing the Message**
+
+   - User enters recipient email
+   - User enters gratitude message
+   - System validates inputs
+   - User submits the form
+
+3. **Sending the Gratitude**
+
+   - System calls the `/api/gratitude/send` endpoint
+   - Email is sent to the recipient
+   - System calls the `/api/gratitude/mark/{statementId}/{actionId}` endpoint
+   - Action is updated with gratitude information
+
+4. **Visual Feedback**
+   - System displays success confirmation
+   - Action UI updates to show gratitude was sent
+   - Dropdown menu options are updated
+   - Tooltips display gratitude information
+
+## Mock Implementation
+
+For development and testing purposes, the frontend includes a mock implementation:
+
+- Controlled by the environment variable `VITE_MOCK_EMAIL_SENDING`
+- When enabled, simulates the API responses without real backend
+- Logs details to console for debugging
+- Includes realistic delays to simulate network latency
+
+To use the mock implementation:
+
+1. Set `VITE_MOCK_EMAIL_SENDING=true` in your environment
+2. The frontend will use the mock implementations in `gratitudeApi.ts`
+3. No actual emails will be sent, but the UI will behave as if they were
+
+## Security Considerations
+
+When implementing the Gratitude API endpoints, consider the following security aspects:
+
+1. **Input Validation**
+
+   - Validate email formats
+   - Sanitize message content to prevent injection
+   - Validate that IDs exist and belong to the requesting user
+
+2. **Authorization**
+
+   - Ensure users can only send gratitude for actions they have access to
+   - Implement proper authentication checks
+   - Verify user permissions before processing requests
+
+3. **Rate Limiting**
+
+   - Implement rate limiting to prevent abuse
+   - Consider limits like maximum 10 emails per hour per user
+   - Add exponential backoff for repeated failures
+
+4. **Email Security**
+
+   - Ensure proper email headers
+   - Prevent header injection
+   - Include unsubscribe options
+   - Follow email sending best practices
+
+5. **Logging**
+   - Log all gratitude emails sent for auditing
+   - Track failures and errors
+   - Monitor for unusual patterns
+
+## Testing the Integration
+
+When testing the integration between frontend and backend:
+
+1. **Verify Email Sending**
+
+   - Test with valid and invalid email addresses
+   - Confirm emails are received by recipients
+   - Check email content and formatting
+
+2. **Test State Updates**
+
+   - Ensure action records are properly updated
+   - Verify timestamps are accurate
+   - Confirm UI updates correctly after sending
+
+3. **Error Handling**
+
+   - Test with various error scenarios
+   - Verify user-friendly error messages
+   - Ensure system recovers gracefully from failures
+
+4. **Edge Cases**
+   - Test with very long messages
+   - Test with special characters
+   - Test with high volume of requests
+
+## Conclusion
+
+The Gratitude API enhances the LIFT application by enabling users to express appreciation for completed actions. When implemented correctly, it creates a positive feedback loop within teams and reinforces collaborative behaviors.
+
+This document provides a comprehensive guide for backend developers to implement the required endpoints and behaviors to support the Gratitude feature in the LIFT frontend application.
diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md
deleted file mode 100644
index a87e6b9..0000000
--- a/MIGRATION_GUIDE.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Project Structure Migration Guide
-
-## Directory Structure Changes
-
-We've restructured the project to follow a more organized, feature-based architecture. Here's a summary of what changed:
-
-### Feature-based Organization
-
-Files are now organized by feature, with each feature containing its own:
-- Components
-- Hooks
-- Context
-- API calls
-- Types (when feature-specific)
-
-### New Directory Structure
-
-```
-src/
-├── assets/             # Images and static assets
-├── components/         # Shared UI components
-│   ├── ui/             # Base UI components (buttons, inputs, etc.)
-│   ├── modals/         # Modal dialogs
-│   └── shared/         # Other shared components
-├── config/             # Application configuration
-├── data/               # Static data files (JSON, etc.)
-├── features/           # Feature-specific code
-│   ├── auth/           # Authentication feature
-│   ├── email/          # Email-related functionality
-│   ├── questions/      # Questions management
-│   ├── statements/     # Statements management
-│   └── wizard/         # Statement wizard feature
-├── layouts/            # Layout components
-├── lib/                # Shared utilities
-│   └── utils/          # Utility functions
-├── providers/          # Context providers
-├── routes/             # Route definitions
-└── types/              # TypeScript type definitions
-```
-
-## Import Updates Required
-
-Due to the restructuring, imports in files need to be updated. Here are the general patterns to follow:
-
-### Old vs New Import Paths
-
-| Old Import Path | New Import Path |
-|-----------------|-----------------|
-| `../components/ui/...` | `../components/ui/...` (unchanged) |
-| `../components/Header` | `../layouts/components/Header` |
-| `../components/MainPage` | `../layouts/components/MainPage` |
-| `../context/AuthContext` | `../features/auth/AuthContext` |
-| `../context/AuthProvider` | `../features/auth/AuthProvider` |
-| `../context/EntriesContext` | `../features/statements/context/EntriesContext` |
-| `../context/EntriesProvider` | `../features/statements/context/EntriesProvider` |
-| `../context/QuestionsContext` | `../providers/QuestionsContext` |
-| `../context/QuestionsProvider` | `../providers/QuestionsProvider` |
-| `../hooks/useAuth` | `../features/auth/hooks/useAuth` |
-| `../hooks/useEntries` | `../features/statements/hooks/useEntries` |
-| `../hooks/useQuestions` | `../features/questions/hooks/useQuestions` |
-| `../api/authApi` | `../features/auth/api/authApi` |
-| `../api/entriesApi` | `../features/statements/api/entriesApi` |
-| `../api/emailApi` | `../features/email/api/emailApi` |
-| `../utils/...` | `../lib/utils/...` |
-| `../data/...` | `../data/...` |
-
-## Next Steps
-
-1. Update imports in all files
-2. Run tests to ensure the restructuring doesn't break functionality
-3. Update build scripts if needed to accommodate the new structure
-
-This restructuring will make the codebase more maintainable, easier to navigate, and better prepared for future growth.
\ No newline at end of file
diff --git a/allcode.py b/allcode.py
index c760571..f02bca1 100644
--- a/allcode.py
+++ b/allcode.py
@@ -33,6 +33,9 @@
     ".DS_Store",
     ".aider.chat.history.md",
     ".aider.input.history",
+    "MAGIC_LINK_AUTH.md",
+    "CLADE.md",
+    "GRATITUDE_API.md",
 }
 
 
diff --git a/docs/IGT DPIA Screening Tool.docx b/docs/IGT DPIA Screening Tool.docx
deleted file mode 100644
index c76ebe9..0000000
Binary files a/docs/IGT DPIA Screening Tool.docx and /dev/null differ
diff --git a/docs/IGT DPIA Screening Tool.rtf b/docs/IGT DPIA Screening Tool.rtf
deleted file mode 100644
index a6db4ea..0000000
--- a/docs/IGT DPIA Screening Tool.rtf	
+++ /dev/null
@@ -1,990 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2821
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 ArialMT;\f1\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red34\green118\blue55;\red255\green255\blue255;\red0\green0\blue0;
-\red11\green90\blue178;\red225\green224\blue224;\red99\green99\blue99;}
-{\*\expandedcolortbl;;\cssrgb\c15686\c52549\c27843;\cssrgb\c100000\c100000\c100000;\cssrgb\c0\c0\c0;
-\cssrgb\c0\c43922\c75294;\cssrgb\c90588\c90196\c90196;\cssrgb\c46275\c46275\c46275;}
-\paperw11900\paperh16840\margl851\margr851\margb851\margt2098
-\deftab720
-\pard\pardeftab720\sl259\slmult1\qc\partightenfactor0
-
-\f0\fs64 \cf2 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Data Protection Impact Assessment (DPIA) Screening Tool\
-\pard\pardeftab720\partightenfactor0
-
-\fs24 \cf2 \kerning1\expnd-1\expndtw-4
-\
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth4920\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx4320
-\clvertalt \clshdrawnil \clwWidth4900\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Project name
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\sl259\slmult1\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Beacons
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth4920\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx4320
-\clvertalt \clshdrawnil \clwWidth4900\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Project lead 
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth4920\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx4320
-\clvertalt \clshdrawnil \clwWidth4900\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Directorate / Service
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth4920\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx4320
-\clvertalt \clshdrawnil \clwWidth4900\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Information Asset Owner(s)\
-\
-{\field{\*\fldinst{HYPERLINK "https://islingtoncouncil.sharepoint.com/sites/IslingtonConnect_InformationGovernance/SitePages/Information-Asset-Owners-&-Leads.aspx"}}{\fldrslt \cf5 \kerning1\expnd-2\expndtw-10
-\ul \ulc5 List of IAOs may be found here}}
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth4920\clftsWidth3 \clheight280 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx4320
-\clvertalt \clshdrawnil \clwWidth4900\clftsWidth3 \clheight280 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Key dates
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth4920\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx4320
-\clvertalt \clshdrawnil \clwWidth4900\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Form completed by
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Alexander Rodriguez, Jason Warren
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Describe the purpose of the project
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Please provide a description of your project. What does the project aim to achieve? Why do you need to collect personal data and how will you use the data to support your project?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Lawful basis
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will you be processing personal data to meet a statutory duty or power? If so, please specify the legislation and associated duty or power.
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat3 \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone If not, is there other legislation which supports your processing? If so, please specify the legislation and supporting argument here
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1120 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone If existing legislation does not apply, please specify the lawful basis you are relying upon. You may find the ICO\'92s {\field{\*\fldinst{HYPERLINK "https://ico.org.uk/for-organisations/gdpr-resources/lawful-basis-interactive-guidance-tool/"}}{\fldrslt \cf5 \kerning1\expnd-2\expndtw-10
-\ul \ulc5 interactive tool}} helpful.
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-What personal data will be processed?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Who are the data subjects (people whose personal data you will be processing)?:
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone What personal data will be processed? (name, address, system ID etc)
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight840 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone What Special Category data will be processed? (ethnicity, religious belief, health etc)
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone What Criminal data will be processed? (convictions, allegations etc)\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-\
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Digital Services
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone If your project involves the purchase or use of new technology, please confirm that you have approached IDS to assess the security of the new system. Please provide the name of the contact in IDS
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Procurement
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone If your project involves a third party and/or contractor please provide their details, the contract number and, if possible, attach a copy of the contract
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Does the project involve any of the following types of processing?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clcbpat2 \clwWidth6160\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clcbpat2 \clwWidth3200\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-#
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Type of processing
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Yes/ No/ Don\'92t Know
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 01
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Uses new technology or IT system that we haven\'92t used before\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 02
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Requires that the data be processed (this includes being stored and accessed by sub-contractors or IT support) outside the UK or the EU?\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 03
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Uses existing data for a new and unexpected or more intrusive purpose (such as tracking people\'92s behaviour or activity)\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight1680 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight1680 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight1680 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 04
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will require new collection or a new purpose of special category or criminal offence data.  (Such as identifying people in a particular group or demographic and proposing a course of action for them e.g. determining access to a service or benefit) or for large numbers of vulnerable people\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 05
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Involves Adult Social Care records for non-direct care purposes\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 06
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Involves processing personal data about individuals which could cause physical harm to them if there was a data breach\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 07
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will require the processing of Children's data to offer online services, or to profile them or to market services to them\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight1380 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight1380 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight1380 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 08
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will Make Automated Decisions About The Individual (where only computers are involved in the decision making process and this may have a significant impact upon the individual such as their ability to access services, opportunities or benefits)\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 09
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Involves surveillance or monitoring of staff or the public\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 10
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Involves two or more organisations linking or pooling data\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 11
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will combine or match data from multiple sources\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 12
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will require the processing of biometric or genetic data (such as fingerprints or facial recognition)\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth280\clftsWidth3 \clheight1120 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx2880
-\clvertalt \clshdrawnil \clwWidth6160\clftsWidth3 \clheight1120 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx5760
-\clvertalt \clshdrawnil \clwWidth3200\clftsWidth3 \clheight1120 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone 13
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will personal data be processed without providing a privacy notice to the data subject? (This means we would be processing their data without telling them)\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell 
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf2 \
-\
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Risk Assessment
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone If you answered \'93Yes\'94 to any of the above questions, please explain what you are doing to mitigate risks associated with this type of processing.
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Please also describe any general mitigation or precautions you are taking to reduce information risk with this project.
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1120 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf2 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\partightenfactor0
-\cf4 \kerning1\expnd-1\expndtw-4
-\
-\
-\
-\
-\
-\
-\
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat2 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-Ethics - Engagement
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat6 \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone If you will be consulting or engaging with any residents, or other stakeholders (staff, practitioners, decision makers) as part of this project please answer the following questions, otherwise leave this section blank
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Which groups or communities do you plan to consult?  
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight280 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Will any of your participants be under 18 or could be considered vulnerable?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone How will you engage / recruit people to take part?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone What methods will you use to engage (for example, focus groups / surveys)?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone What process will you use when seeking to obtain consent? (please attach or include a link to forms)
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone What are the risks to confidentiality or anonymity and how will these be mitigated?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1120 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone How will insight gained will be shared with stakeholders, including with people taking part?
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf4 \kerning1\expnd-1\expndtw-4
-\up0 \nosupersub \ulnone \cell \lastrow\row
-\pard\pardeftab720\sa240\partightenfactor0
-\cf4 \kerning1\expnd-1\expndtw-4
-\
-\pard\pardeftab720\sa120\qc\partightenfactor0
-
-\fs32 \cf4 \kerning1\expnd0\expndtw0 Please return this form to your data protection lead or by emailing {\field{\*\fldinst{HYPERLINK "mailto:dp@islington.gov.uk"}}{\fldrslt \cf5 \ul \ulc5 dp@islington.gov.uk}}\
-\pard\pardeftab720\partightenfactor0
-
-\fs24 \cf4 \page 
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrt\brdrnil \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat7 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf3 \kerning1\expnd-2\expndtw-10
-\
-To be completed by the Information Governance Team
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Please provide assessment as to whether a full DPIA is required. Please include any further recommendations or actions for this project.
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight1100 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat7 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Ethics Score
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat3 \clwWidth10000\clftsWidth3 \clheight840 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone     \
-   NULL                                        LOW                                         MED                                          HIGH\
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat7 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Date Forwarded to Ethics Group
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat3 \clwWidth10000\clftsWidth3 \clheight820 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-\cf0 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-\cf4 \
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat7 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone IGT Reference
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat3 \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat7 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Name
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clcbpat7 \clwWidth10000\clftsWidth3 \clheight260 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\pardeftab720\partightenfactor0
-
-\f0 \cf3 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone Date
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf4 \kerning1\expnd-2\expndtw-10
-\up0 \nosupersub \ulnone \cell \row
-
-\itap1\trowd \taflags1 \trgaph108\trleft-108 \trbrdrl\brdrnil \trbrdrt\brdrnil \trbrdrr\brdrnil 
-\clvertalt \clshdrawnil \clwWidth10000\clftsWidth3 \clheight540 \clbrdrt\brdrs\brdrw20\brdrcf4 \clbrdrl\brdrs\brdrw20\brdrcf4 \clbrdrb\brdrs\brdrw20\brdrcf4 \clbrdrr\brdrs\brdrw20\brdrcf4 \clpadt80 \clpadl80 \clpadb80 \clpadr80 \gaph\cellx8640
-\pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-
-\f1 \cf0 \kerning1\expnd0\expndtw0 \up0 \nosupersub \ulnone 
-\f0 \cf4 \up0 \nosupersub \ulnone \cell \lastrow\row
-}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 54e76f7..16be15b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "liftv0",
       "version": "0.0.0",
       "dependencies": {
+        "@types/intro.js": "^5.1.5",
         "better-auth": "^1.2.3",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
@@ -15,6 +16,7 @@
         "compromise": "^14.14.4",
         "date-fns": "^4.1.0",
         "framer-motion": "^12.4.1",
+        "intro.js": "^7.2.0",
         "lucide-react": "^0.475.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
@@ -1880,6 +1882,11 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/intro.js": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/@types/intro.js/-/intro.js-5.1.5.tgz",
+      "integrity": "sha512-TT1d8ayz07svlBcoqh26sNpQaU6bBpdFcCC+IMZHp46NNX2mYAHAVefM3wCmQSd4UWhhObeMjFByw2IaPKOXlw=="
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -3539,6 +3546,11 @@
         "node": ">=0.8.19"
       }
     },
+    "node_modules/intro.js": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-7.2.0.tgz",
+      "integrity": "sha512-qbMfaB70rOXVBceIWNYnYTpVTiZsvQh/MIkfdQbpA9di9VBfj1GigUPfcCv3aOfsbrtPcri8vTLTA4FcEDcHSQ=="
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
diff --git a/package.json b/package.json
index c790c26..026f18c 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "preview": "vite preview  --mode production"
   },
   "dependencies": {
+    "@types/intro.js": "^5.1.5",
     "better-auth": "^1.2.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -18,6 +19,7 @@
     "compromise": "^14.14.4",
     "date-fns": "^4.1.0",
     "framer-motion": "^12.4.1",
+    "intro.js": "^7.2.0",
     "lucide-react": "^0.475.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/src/App.tsx b/src/App.tsx
index f001e92..006a16f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,6 +7,7 @@ import { TooltipProvider } from './components/ui/better-tooltip';
 import { AuthProvider } from './features/auth/AuthProvider';
 import { EntriesProvider } from './features/statements/context/EntriesProvider';
 import { QuestionsProvider } from './providers/QuestionsProvider';
+import { HelpProvider } from './components/ui/tour';
 
 // Components
 import LoginPage from './features/auth/components/LoginPage';
@@ -64,9 +65,11 @@ const App: React.FC = () => {
       <AuthProvider>
         <EntriesProvider>
           <QuestionsProvider>
-            <AppContent />
-            {/* Add the mock notification component for testing */}
-            {import.meta.env.DEV && <MockNotification />}
+            <HelpProvider>
+              <AppContent />
+              {/* Add the mock notification component for testing */}
+              {import.meta.env.DEV && <MockNotification />}
+            </HelpProvider>
           </QuestionsProvider>
         </EntriesProvider>
       </AuthProvider>
diff --git a/src/components/modals/GratitudeModal.tsx b/src/components/modals/GratitudeModal.tsx
index 79b2cd3..bc7c620 100644
--- a/src/components/modals/GratitudeModal.tsx
+++ b/src/components/modals/GratitudeModal.tsx
@@ -61,10 +61,10 @@ const GratitudeModal: React.FC<GratitudeModalProps> = ({
       };
 
       // Check if we're in mock mode
-      const isMockMode = 
-        typeof import.meta.env.VITE_MOCK_EMAIL_SENDING === 'undefined' || 
+      const isMockMode =
+        typeof import.meta.env.VITE_MOCK_EMAIL_SENDING === 'undefined' ||
         import.meta.env.VITE_MOCK_EMAIL_SENDING === 'true';
-      
+
       try {
         // Try to send gratitude via API
         await sendGratitude(gratitudeRequest);
@@ -104,47 +104,47 @@ const GratitudeModal: React.FC<GratitudeModalProps> = ({
           <div
             className='relative rounded-md overflow-hidden'
             style={{
-              border: '8px solid transparent',
+              border: '6px solid transparent', // Reduced from 8px for mobile
               borderImage:
                 'repeating-linear-gradient(45deg, #ff69b4, #ff69b4 10px, #fb86b0 10px, #fb86b0 20px) 8',
-              padding: '16px',
-              margin: '-8px',
+              padding: '12px', // Reduced from 16px for mobile
+              margin: '-6px', // Reduced from -8px to match border
               background: '#f9f9f9',
             }}
             onClick={(e) => e.stopPropagation()}
           >
-            {/* Heart decoration */}
-            <div className='absolute top-4 right-4 text-pink-400 opacity-20 pointer-events-none'>
-              <Heart size={40} />
+            {/* Heart decoration - smaller on mobile */}
+            <div className='absolute top-2 right-2 sm:top-4 sm:right-4 text-pink-400 opacity-20 pointer-events-none'>
+              <Heart size={24} className="sm:hidden" />
+              <Heart size={40} className="hidden sm:block" />
             </div>
 
-            <DialogDescription className='mt-0 text-center'>
+            <DialogDescription className='mt-0 text-center text-sm'>
               Express gratitude for this action
             </DialogDescription>
 
-            <div className='text-center mb-4'>
-              <p className='text-sm text-gray-500 mt-1'>
+            <div className='text-center mb-3 sm:mb-4'>
+              <p className='text-xs sm:text-sm text-gray-500 mt-1'>
                 To: {managerName || managerEmail || 'No recipient set'}
               </p>
               {sendSuccess && (
-                <p className='text-green-600 text-sm font-medium mt-2 bg-green-50 py-1 px-2 rounded-full inline-block'>
+                <p className='text-green-600 text-xs sm:text-sm font-medium mt-2 bg-green-50 py-1 px-2 rounded-full inline-block'>
                   ✓ Gratitude sent successfully!
                 </p>
               )}
             </div>
 
             {sendError && (
-              <div className='bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded mb-4'>
+              <div className='bg-red-50 border border-red-200 text-red-700 px-3 py-2 sm:px-4 sm:py-3 rounded mb-3 sm:mb-4 text-xs sm:text-sm'>
                 {sendError}
               </div>
             )}
 
-            <div className='mb-6 p-4 bg-white rounded-md shadow-sm border border-pink-100'>
-              <h3 className='font-semibold text-gray-700 mb-2 flex items-center'>
-                <span className='mr-2'>→</span>
+            <div className='mb-4 sm:mb-6 p-3 sm:p-4 bg-white rounded-md shadow-sm border border-pink-100'>
+              <h3 className='font-semibold text-gray-700 mb-1 sm:mb-2 flex items-center text-sm sm:text-base'>
                 Action
               </h3>
-              <p className='text-gray-600'>{action.action}</p>
+              <p className='text-gray-600 text-xs sm:text-sm break-words'>{action.action}</p>
               {action.byDate && (
                 <p className='text-xs text-gray-500 mt-1'>
                   Due by: {action.byDate}
@@ -152,17 +152,17 @@ const GratitudeModal: React.FC<GratitudeModalProps> = ({
               )}
             </div>
 
-            <div className='mb-6'>
+            <div className='mb-4 sm:mb-6'>
               <label
                 htmlFor='gratitude-message'
-                className='block text-sm font-medium text-gray-700 mb-2'
+                className='block text-xs sm:text-sm font-medium text-gray-700 mb-1 sm:mb-2'
               >
                 Your gratitude message:
               </label>
               <textarea
                 id='gratitude-message'
-                rows={4}
-                className='w-full rounded-md border border-pink-200 focus:border-pink-500 focus:ring-pink-500 text-gray-900 p-3'
+                rows={3} // Reduced from 4 for mobile
+                className='w-full rounded-md border border-pink-200 focus:border-pink-500 focus:ring-pink-500 text-gray-900 p-2 sm:p-3 text-sm'
                 placeholder='Express your thanks and appreciation here...'
                 value={message}
                 onChange={(e) => setMessage(e.target.value)}
@@ -172,26 +172,30 @@ const GratitudeModal: React.FC<GratitudeModalProps> = ({
               </p>
             </div>
 
-            <div className='mt-6 flex justify-center gap-4'>
+            <div className='mt-4 sm:mt-6 flex justify-center gap-2 sm:gap-4'>
               <Button
                 variant='default'
                 onClick={handleSendGratitude}
                 disabled={isSending || !message.trim() || !managerEmail}
-                className='shadow-sm bg-pink-600 hover:bg-pink-700 text-white'
+                className='shadow-sm bg-pink-600 hover:bg-pink-700 text-white text-xs sm:text-sm px-2 sm:px-4 py-1 sm:py-2'
               >
                 {isSending ? (
                   <>
-                    <Loader2 className='mr-2 h-4 w-4 animate-spin' />
+                    <Loader2 className='mr-1 sm:mr-2 h-3 w-3 sm:h-4 sm:w-4 animate-spin' />
                     <span>Sending...</span>
                   </>
                 ) : (
                   <>
-                    <Heart className='mr-2 h-4 w-4' />
+                    <Heart className='mr-1 sm:mr-2 h-3 w-3 sm:h-4 sm:w-4' />
                     <span>Send Gratitude</span>
                   </>
                 )}
               </Button>
-              <Button variant='outline' onClick={onClose}>
+              <Button 
+                variant='outline' 
+                onClick={onClose}
+                className='text-xs sm:text-sm px-2 sm:px-4 py-1 sm:py-2'
+              >
                 <span>Cancel</span>
               </Button>
             </div>
diff --git a/src/components/modals/ShareEmailModal.tsx b/src/components/modals/ShareEmailModal.tsx
index 781b413..f7780f2 100644
--- a/src/components/modals/ShareEmailModal.tsx
+++ b/src/components/modals/ShareEmailModal.tsx
@@ -1,86 +1,31 @@
 'use client';
 
 import React, { useState } from 'react';
-import { SimpleDialog as Dialog, SimpleDialogContent as DialogContent, SimpleDialogDescription as DialogDescription } from '../ui/simple-dialog';
+import {
+  SimpleDialog as Dialog,
+  SimpleDialogContent as DialogContent,
+  SimpleDialogDescription as DialogDescription,
+} from '../ui/simple-dialog';
 import { Button } from '../ui/button';
 import { useEntries } from '../../features/statements/hooks/useEntries';
-import { sendEmail } from '../../features/email/api/emailApi';
-import { Email } from '../../types/emails';
+import { shareStatements } from '../../features/email/api/emailApi';
 import { Loader2 } from 'lucide-react';
 import { getVerbName } from '../../lib/utils/verbUtils';
 import PrivacyModal from './PrivacyModal';
 
 const ShareEmailModal: React.FC<{ onClose: () => void }> = ({ onClose }) => {
   const { data } = useEntries();
-  const { username, managerName, managerEmail } = data;
+  const { managerName, managerEmail } = data;
   const [isSending, setIsSending] = useState(false);
   const [sendError, setSendError] = useState<string | null>(null);
   const [sendSuccess, setSendSuccess] = useState(false);
   const [isPrivacyModalOpen, setIsPrivacyModalOpen] = useState(false);
 
-  // Only include public statements that are not resolved
+  // Only include public statements that are not archived
   const publicStatements = data.entries.filter(
-    (entry) => entry.isPublic && !entry.isResolved
+    (entry) => entry.isPublic && !entry.isArchived
   );
 
-  const generateEmailHtml = () => {
-    let html = `
-      <h1 style="color: #333; font-size: 24px; margin-bottom: 20px;">Statements from ${username}</h1>
-      <p style="font-size: 16px; margin-bottom: 30px;">
-        ${username} would like to share the following statements with you:
-      </p>
-    `;
-
-    publicStatements.forEach((entry) => {
-      html += `
-        <div style="margin-bottom: 25px; padding: 15px; border-left: 4px solid #ff69b4; background-color: #f9f9f9;">
-          <p style="font-weight: bold; font-size: 18px; margin-bottom: 10px;">
-            ${entry.atoms.subject} ${getVerbName(entry.atoms.verb)} ${entry.atoms.object}
-          </p>
-      `;
-
-      // Add actions if they exist
-      if (entry.actions && entry.actions.length > 0) {
-        const pendingActions = entry.actions.filter(
-          (action) => !action.completed
-        );
-
-        if (pendingActions.length > 0) {
-          html += `<div style="margin-top: 10px;">
-            <p style="font-weight: bold; color: #555; font-size: 14px;">Actions:</p>
-            <ul style="padding-left: 20px;">`;
-
-          pendingActions.forEach((action) => {
-            html += `
-              <li style="margin-bottom: 5px;">
-                <div style="font-size: 14px;">
-                  ${action.action}
-                  ${
-                    action.byDate
-                      ? `<span style="color: #888; font-size: 12px;"> (Due: ${action.byDate})</span>`
-                      : ''
-                  }
-                </div>
-              </li>
-            `;
-          });
-
-          html += `</ul></div>`;
-        }
-      }
-
-      html += `</div>`;
-    });
-
-    html += `
-      <p style="font-size: 14px; color: #666; margin-top: 30px; border-top: 1px solid #eee; padding-top: 20px;">
-        This email was sent from the Lift application.
-      </p>
-    `;
-
-    return html;
-  };
-
   const handleSendEmail = async () => {
     try {
       setIsSending(true);
@@ -88,28 +33,28 @@ const ShareEmailModal: React.FC<{ onClose: () => void }> = ({ onClose }) => {
 
       if (!managerEmail || managerEmail.trim() === '') {
         throw new Error(
-          'Manager email is not set. Please set a manager email first.'
+          'Manager email is not set. Please set a manager email first in your User Data.'
+        );
+      }
+
+      if (!data.userEmail) {
+        throw new Error(
+          'Your email address is not available. Please try signing out and signing in again with magic link.'
         );
       }
 
-      const emailPayload: Email = {
-        from: 'notifications@lift-app.com', // This should be your app's email
-        to: [managerEmail],
-        subject: `${username} would like to share statements with you`,
-        html: generateEmailHtml(),
-      };
+      // Send the user's email to the backend, which will retrieve the user's statements
+      // and send them to the manager email address stored in the user's profile
+      await shareStatements(data.userEmail);
 
-      await sendEmail(emailPayload);
       setSendSuccess(true);
-
-      // Automatically close after successful send
       setTimeout(() => onClose(), 2000);
     } catch (error) {
-      console.error('Failed to send email:', error);
+      console.error('Failed to share statements:', error);
       setSendError(
         typeof error === 'object' && error !== null && 'message' in error
           ? (error as Error).message
-          : 'Failed to send email. Please try again later.'
+          : 'Failed to share statements. Please try again later.'
       );
     } finally {
       setIsSending(false);
@@ -118,143 +63,133 @@ const ShareEmailModal: React.FC<{ onClose: () => void }> = ({ onClose }) => {
 
   return (
     <>
-      {isPrivacyModalOpen && <PrivacyModal onClose={() => setIsPrivacyModalOpen(false)} />}
+      {isPrivacyModalOpen && (
+        <PrivacyModal onClose={() => setIsPrivacyModalOpen(false)} />
+      )}
       <Dialog open onOpenChange={onClose}>
         <DialogContent
           headerTitle={`Sharing with ${managerName || 'your manager'}`}
         >
-        <div
-          className='relative rounded-md overflow-hidden'
-          style={{
-            border: '8px solid transparent',
-            borderImage:
-              'repeating-linear-gradient(45deg, #ff69b4, #ff69b4 10px, #4169e1 10px, #4169e1 20px) 8',
-            padding: '16px',
-            margin: '-8px',
-            background: '#f9f9f9',
-          }}
-          onClick={(e) => e.stopPropagation()}
-        >
-          {/* Postal stamp decoration */}
-          <div className='absolute top-4 right-4 w-16 h-20 border-2 border-gray-400 border-dashed rounded-sm opacity-20 flex items-center justify-center pointer-events-none'>
-            <div className='w-12 h-12 border-2 border-gray-500 rounded-full flex items-center justify-center'>
-              <span className='transform rotate-12 text-gray-500 text-[10px] font-mono'>
-                MAIL
-              </span>
-            </div>
-          </div>
-
-          <DialogDescription className='mt-0 text-center'>
-            Below are your public, unresolved statements
-          </DialogDescription>
-
-          <div className='text-center mb-6'>
-            <p className='text-sm text-gray-500 mt-1'>
-              Email will be sent to: {managerEmail || 'No email set'}
-            </p>
-            {sendSuccess && (
-              <p className='text-green-600 text-sm font-medium mt-2 bg-green-50 py-1 px-2 rounded-full inline-block'>
-                ✓ Email sent successfully!
+          <div
+            className='relative rounded-md overflow-hidden'
+            style={{
+              border: '6px solid transparent', // Reduced from 8px to 6px for mobile
+              borderImage:
+                'repeating-linear-gradient(45deg, #ff69b4, #ff69b4 10px, #4169e1 10px, #4169e1 20px) 8',
+              padding: '12px', // Reduced from 16px for mobile
+              margin: '-6px', // Reduced from -8px to match border
+              background: '#f9f9f9',
+            }}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <DialogDescription className='mt-0 text-center text-sm'>
+              Below are your public, unarchived statements
+            </DialogDescription>
+
+            <div className='text-center mb-3 sm:mb-4'>
+              <p className='text-xs sm:text-sm text-gray-500 mt-1 break-all'>
+                Email will be sent to: {managerEmail || 'No email set'}
               </p>
-            )}
-            <div className="mt-3 p-2 bg-gray-50 rounded-md text-xs text-gray-600 border border-gray-200">
-              <p>Only public statements will be shared. For details on how we process your data, see our <button onClick={() => setIsPrivacyModalOpen(true)} className="text-brand-pink underline">Privacy Policy</button>.</p>
-            </div>
-          </div>
-
-          {sendError && (
-            <div className='bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded mb-4'>
-              {sendError}
+              {sendSuccess && (
+                <p className='text-green-600 text-xs sm:text-sm font-medium mt-2 bg-green-50 py-1 px-2 rounded-full inline-block'>
+                  ✓ Email sent successfully!
+                </p>
+              )}
+              <div className='mt-2 p-2 bg-gray-50 rounded-md text-xs text-gray-600 border border-gray-200'>
+                <p className='text-xs'>
+                  Only public statements will be shared. For details on how we
+                  process your data, see our{' '}
+                  <button
+                    onClick={() => setIsPrivacyModalOpen(true)}
+                    className='text-brand-pink underline'
+                  >
+                    Privacy Policy
+                  </button>
+                  .
+                </p>
+              </div>
             </div>
-          )}
 
-          <div className='mt-4 space-y-5 max-h-[50vh] overflow-y-auto px-1'>
-            {publicStatements.length > 0 ? (
-              publicStatements.map((entry) => (
-                <div
-                  key={entry.id}
-                  className='p-4 border bg-white shadow-sm rounded-sm relative'
-                  style={{
-                    backgroundImage:
-                      'linear-gradient(0deg, rgba(255, 105, 180, 0.05) 1px, transparent 1px)',
-                    backgroundSize: '100% 20px',
-                    borderColor: '#e5e5e5',
-                  }}
-                >
-                  <p className='text-base font-semibold'>{entry.atoms.subject} {getVerbName(entry.atoms.verb)} {entry.atoms.object}</p>
-                  {entry.actions && entry.actions.length > 0 && (
-                    <div className='mt-3 space-y-2'>
-                      <div className='text-xs uppercase tracking-wider text-gray-500 font-semibold border-b border-gray-200 pb-1 mb-2'>
-                        Actions
-                      </div>
-                      {entry.actions
-                        .filter((action) => !action.completed)
-                        .map((action) => (
-                          <div
-                            key={action.id}
-                            className='pl-3 border-l-2 border-pink-200 ml-2 py-1'
-                          >
-                            <p className='text-sm'>{action.action}</p>
-                            {action.byDate && action.byDate.trim() !== '' && (
-                              <p className='text-xs text-gray-500 italic'>
-                                Due by: {action.byDate}
-                              </p>
-                            )}
-                          </div>
-                        ))}
-                    </div>
-                  )}
-                  <div className='absolute top-1 right-2 opacity-20'>
-                    <svg
-                      width='24'
-                      height='24'
-                      viewBox='0 0 24 24'
-                      fill='none'
-                      xmlns='http://www.w3.org/2000/svg'
-                    >
-                      <path
-                        d='M21 14H3M21 4H3M21 9H3M21 19H3'
-                        stroke='#ff69b4'
-                        strokeWidth='2'
-                        strokeLinecap='round'
-                        strokeLinejoin='round'
-                      />
-                    </svg>
-                  </div>
-                </div>
-              ))
-            ) : (
-              <div className='text-gray-600 text-center p-8 bg-white border border-gray-200 rounded-sm'>
-                No public unresolved statements available.
+            {sendError && (
+              <div className='bg-red-50 border border-red-200 text-red-700 px-3 py-2 sm:px-4 sm:py-3 rounded mb-3 text-xs sm:text-sm'>
+                {sendError}
               </div>
             )}
-          </div>
 
-          <div className='mt-6 flex justify-center gap-4'>
-            <Button
-              variant='default'
-              onClick={handleSendEmail}
-              disabled={
-                isSending || publicStatements.length === 0 || !managerEmail
-              }
-              className='shadow-sm'
-            >
-              {isSending ? (
-                <>
-                  <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                  <span>Sending...</span>
-                </>
+            <div className='mt-3 space-y-3 max-h-[40vh] sm:max-h-[50vh] overflow-y-auto px-1'>
+              {publicStatements.length > 0 ? (
+                publicStatements.map((entry) => (
+                  <div
+                    key={entry.id}
+                    className='p-3 sm:p-4 border bg-white shadow-sm rounded-sm'
+                  >
+                    <p className='text-sm sm:text-base font-semibold break-words'>
+                      {entry.atoms.subject} {getVerbName(entry.atoms.verb)}{' '}
+                      {entry.atoms.object}
+                    </p>
+
+                    {entry.actions && entry.actions.length > 0 && (
+                      <div className='mt-2 sm:mt-3'>
+                        <div className='text-xs uppercase text-gray-500 font-semibold border-b border-gray-200 pb-1 mb-1 sm:mb-2'>
+                          Actions
+                        </div>
+                        {entry.actions
+                          .filter((action) => !action.completed)
+                          .map((action) => (
+                            <div
+                              key={action.id}
+                              className='pl-2 sm:pl-3 border-l-2 border-pink-200 ml-1 sm:ml-2 py-1 mt-1 sm:mt-2'
+                            >
+                              <p className='text-xs sm:text-sm break-words'>
+                                {action.action}
+                              </p>
+                              {action.byDate && action.byDate.trim() !== '' && (
+                                <p className='text-xs text-gray-500 italic'>
+                                  Due by: {action.byDate}
+                                </p>
+                              )}
+                            </div>
+                          ))}
+                      </div>
+                    )}
+                  </div>
+                ))
               ) : (
-                <span>Send Email</span>
+                <div className='text-gray-600 text-center p-4 sm:p-6 bg-white border border-gray-200 rounded-md text-sm'>
+                  No public unarchived statements available.
+                </div>
               )}
-            </Button>
-            <Button variant='outline' onClick={onClose}>
-              <span>Close</span>
-            </Button>
+            </div>
+
+            <div className='mt-4 sm:mt-6 flex justify-center gap-2 sm:gap-4'>
+              <Button
+                variant='default'
+                onClick={handleSendEmail}
+                disabled={
+                  isSending || publicStatements.length === 0 || !managerEmail
+                }
+                className='text-xs sm:text-sm px-2 sm:px-4 py-1 sm:py-2'
+              >
+                {isSending ? (
+                  <>
+                    <Loader2 className='mr-1 sm:mr-2 h-3 w-3 sm:h-4 sm:w-4 animate-spin' />
+                    <span>Sending...</span>
+                  </>
+                ) : (
+                  <span>Send Email</span>
+                )}
+              </Button>
+              <Button
+                variant='outline'
+                onClick={onClose}
+                className='text-xs sm:text-sm px-2 sm:px-4 py-1 sm:py-2'
+              >
+                Close
+              </Button>
+            </div>
           </div>
-        </div>
-      </DialogContent>
-    </Dialog>
+        </DialogContent>
+      </Dialog>
     </>
   );
 };
diff --git a/src/components/modals/UserDataModal.tsx b/src/components/modals/UserDataModal.tsx
index 44b25e1..87ab46f 100644
--- a/src/components/modals/UserDataModal.tsx
+++ b/src/components/modals/UserDataModal.tsx
@@ -1,12 +1,11 @@
 'use client';
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { useEntries } from '../../features/statements/hooks/useEntries';
 import { useAuth } from '../../features/auth/api/hooks';
 import { Button } from '../ui/button';
 import { Input } from '../ui/input';
 import { Save, X, User, Mail, Award, Edit2, LogOut } from 'lucide-react';
-import { Tooltip, TooltipTrigger, TooltipContent } from '../ui/better-tooltip';
 import { validateEmail } from '../../lib/utils/validateEmail';
 import QuestionCounter from '../ui/questionCounter/QuestionCounter';
 import ProgressWithFeedback from '../ui/progress/ProgressWithFeedback';
@@ -19,6 +18,18 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
   const { data, setData } = useEntries();
   const { signOut } = useAuth();
   const [isEditingContact, setIsEditingContact] = useState(false);
+  
+  // Add refs for height measurements
+  const userViewRef = useRef<HTMLDivElement>(null);
+  const userEditRef = useRef<HTMLDivElement>(null);
+  const managerViewRef = useRef<HTMLDivElement>(null);
+  const managerEditRef = useRef<HTMLDivElement>(null);
+  
+  // Store heights in state to handle transitions
+  const [userViewHeight, setUserViewHeight] = useState<number>(0);
+  const [userEditHeight, setUserEditHeight] = useState<number>(0);
+  const [managerViewHeight, setManagerViewHeight] = useState<number>(0);
+  const [managerEditHeight, setManagerEditHeight] = useState<number>(0);
   const [isEditingUsername, setIsEditingUsername] = useState(false);
   const [managerEmailInput, setManagerEmailInput] = useState(
     data.managerEmail || ''
@@ -33,6 +44,7 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
     await signOut();
     // Clear user data from entries context
     setData({ type: 'SET_USERNAME', payload: '' });
+    setData({ type: 'SET_USER_EMAIL', payload: '' });
     setData({ type: 'SET_MANAGER_NAME', payload: '' });
     setData({ type: 'SET_MANAGER_EMAIL', payload: '' });
     // Close modal
@@ -55,6 +67,36 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
     data.managerName,
     data.username,
   ]);
+  
+  // Measure content heights when they change or when edit state changes
+  useEffect(() => {
+    // Use a small delay to ensure the DOM has updated
+    const measureHeights = () => {
+      setTimeout(() => {
+        // Measure user info section heights
+        if (userViewRef.current) {
+          setUserViewHeight(userViewRef.current.scrollHeight);
+        }
+        if (userEditRef.current) {
+          setUserEditHeight(userEditRef.current.scrollHeight);
+        }
+        
+        // Measure manager info section heights
+        if (managerViewRef.current) {
+          setManagerViewHeight(managerViewRef.current.scrollHeight);
+        }
+        if (managerEditRef.current) {
+          setManagerEditHeight(managerEditRef.current.scrollHeight);
+        }
+      }, 10);
+    };
+    
+    measureHeights();
+    
+    // Add resize listener to handle window size changes
+    window.addEventListener('resize', measureHeights);
+    return () => window.removeEventListener('resize', measureHeights);
+  }, [isEditingUsername, isEditingContact, data.username, data.userEmail, data.managerName, data.managerEmail]);
 
   const handleSaveContact = () => {
     if (managerEmailInput.trim() && !validateEmail(managerEmailInput.trim())) {
@@ -107,56 +149,111 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
             background: 'linear-gradient(135deg, #f5f7fa 0%, #f8f9fb 100%)',
           }}
         >
-          <div className='p-4 sm:p-6'>
+          <div className='p-3 max-h-[calc(100vh-140px)] overflow-y-auto'>
             {/* Main content with responsive layout */}
-            <div className='flex flex-col sm:flex-row gap-4'>
+            <div className='flex flex-col sm:flex-row gap-2'>
               {/* Left column for desktop (stacked on mobile) */}
-              <div className='flex flex-col space-y-4 sm:w-1/2 sm:self-stretch'>
-                {/* Username section */}
-                <div className='bg-white rounded-lg p-3 shadow-sm border border-pink-100'>
-                  <div className='flex items-center justify-between mb-1'>
+              <div className='flex flex-col space-y-2 sm:w-1/2 sm:self-stretch'>
+                {/* User Profile Section */}
+                <div className='bg-white rounded-lg p-2 shadow-sm border border-pink-100 transition-all duration-300'>
+                  {/* User Information Title */}
+                  <div className='flex items-center justify-between mb-2'>
                     <div className='flex items-center'>
-                      <User size={16} className='text-brand-pink mr-1' />
+                      <User size={14} className='text-brand-pink mr-1' />
                       <div className='text-xs font-semibold text-gray-700'>
-                        Your name
+                        Your information
                       </div>
                     </div>
                     {!isEditingUsername && (
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <button
-                            className='flex items-center justify-center rounded-full bg-pink-50 p-1 text-brand-pink hover:bg-pink-100 transition-colors'
-                            aria-label='Edit your name'
-                            onClick={() => setIsEditingUsername(true)}
-                            type='button'
-                          >
-                            <Edit2 size={14} />
-                          </button>
-                        </TooltipTrigger>
-                        <TooltipContent>Edit your name</TooltipContent>
-                      </Tooltip>
+                      <button
+                        className='flex items-center justify-center rounded-full bg-pink-50 p-1 text-brand-pink hover:bg-pink-100 transition-colors'
+                        aria-label='Edit your name'
+                        onClick={() => setIsEditingUsername(true)}
+                        type='button'
+                      >
+                        <Edit2 size={12} />
+                      </button>
                     )}
                   </div>
 
+                  <div className='overflow-hidden transition-height duration-300' style={{height: isEditingUsername ? `${userEditHeight}px` : `${userViewHeight}px`}}>
                   {isEditingUsername ? (
-                    <div className='space-y-2'>
-                      <Input
-                        value={usernameInput}
-                        onChange={(e) => setUsernameInput(e.target.value)}
-                        placeholder='Enter your name'
-                        aria-label='Your Name'
-                        className='w-full border-pink-200 focus:border-brand-pink text-sm'
-                      />
-                      <div className='flex space-x-2'>
+                    <div className='space-y-2' ref={userEditRef}>
+                      <div>
+                        <label
+                          htmlFor='username'
+                          className='block text-sm font-medium text-gray-700 mb-1'
+                        >
+                          Your Name
+                        </label>
+                        <Input
+                          id='username'
+                          value={usernameInput}
+                          onChange={(e) => setUsernameInput(e.target.value)}
+                          placeholder='Enter your name'
+                          aria-label='Your Name'
+                          className='w-full h-8 rounded-md border border-pink-200 focus:border-brand-pink text-gray-500 text-sm px-2'
+                        />
+                      </div>
+
+                      {data.userEmail && (
+                        <div className='flex flex-col sm:flex-row sm:items-center gap-1'>
+                          <div className='flex-1'>
+                            <label
+                              htmlFor='useremail'
+                              className='block text-xs font-medium mb-0.5'
+                            >
+                              <span className='text-gray-500'>Your Email</span>
+                              <span className='ml-1 text-gray-400 italic'>
+                                (cannot be changed)
+                              </span>
+                            </label>
+                            <div className='flex h-8'>
+                              <input
+                                id='useremail'
+                                value={data.userEmail}
+                                readOnly
+                                disabled
+                                className='w-full h-full rounded-l-md bg-gray-100 border border-gray-200 text-gray-500 text-xs px-2'
+                              />
+                              <div className='flex items-center justify-center bg-gray-100 text-gray-500 px-1 rounded-r-md border border-l-0 border-gray-200 h-full'>
+                                <svg
+                                  xmlns='http://www.w3.org/2000/svg'
+                                  width='10'
+                                  height='10'
+                                  viewBox='0 0 24 24'
+                                  fill='none'
+                                  stroke='currentColor'
+                                  strokeWidth='2'
+                                  strokeLinecap='round'
+                                  strokeLinejoin='round'
+                                >
+                                  <rect
+                                    x='3'
+                                    y='11'
+                                    width='18'
+                                    height='11'
+                                    rx='2'
+                                    ry='2'
+                                  ></rect>
+                                  <path d='M7 11V7a5 5 0 0 1 10 0v4'></path>
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      )}
+
+                      <div className='flex justify-end space-x-2 mt-2'>
                         <Button
                           onClick={handleSaveUsername}
                           variant='pink'
                           size='sm'
                           aria-label='Save Name'
-                          className='px-2 py-0.5 h-auto text-xs'
+                          className='px-2 py-0.5 h-6 text-xs'
                           type='button'
                         >
-                          <Save size={12} className='mr-1' />
+                          <Save size={10} className='mr-1' />
                           Save
                         </Button>
                         <Button
@@ -167,67 +264,90 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
                           variant='outline'
                           size='sm'
                           aria-label='Cancel Editing'
-                          className='px-2 py-0.5 h-auto text-xs'
+                          className='px-2 py-0.5 h-6 text-xs'
                           type='button'
                         >
-                          <X size={12} className='mr-1' />
+                          <X size={10} className='mr-1' />
                           Cancel
                         </Button>
                       </div>
                     </div>
                   ) : (
-                    <div className='bg-pink-50 px-2 py-1 rounded-md text-sm font-medium text-gray-800 break-words'>
-                      {data.username || 'Not set'}
+                    <div className='text-sm' ref={userViewRef}>
+                      <div className='bg-pink-50 px-2 py-1 rounded-md mb-1'>
+                        <span className='text-xs text-gray-500'>Name:</span>{' '}
+                        <span className='font-medium text-gray-800 break-words'>
+                          {data.username || 'Not set'}
+                        </span>
+                      </div>
+
+                      {data.userEmail && (
+                        <div className='bg-pink-50 px-2 py-1 rounded-md mt-2'>
+                          <span className='text-xs text-gray-500'>Email:</span>{' '}
+                          <span className='font-medium text-gray-800 break-all'>
+                            {data.userEmail}
+                          </span>
+                        </div>
+                      )}
                     </div>
                   )}
+                  </div>
                 </div>
 
                 {/* Manager contact section */}
-                <div className='bg-white rounded-lg p-3 shadow-sm border border-pink-100 flex-grow'>
-                  <div className='flex items-center justify-between mb-1'>
+                <div className='bg-white rounded-lg p-2 shadow-sm border border-pink-100 flex-grow transition-all duration-300'>
+                  <div className='flex items-center justify-between mb-2'>
                     <div className='flex items-center'>
-                      <Mail size={16} className='text-brand-pink mr-1' />
+                      <Mail size={14} className='text-brand-pink mr-1' />
                       <div className='text-xs font-semibold text-gray-700'>
-                        Line manager's details
+                        Line manager's info
                       </div>
                     </div>
                     {!isEditingContact && (
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <button
-                            className='flex items-center justify-center rounded-full bg-pink-50 p-1 text-brand-pink hover:bg-pink-100 transition-colors'
-                            aria-label="Edit your line manager's details"
-                            onClick={() => setIsEditingContact(true)}
-                            type='button'
-                          >
-                            <Edit2 size={14} />
-                          </button>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                          Edit line manager's details
-                        </TooltipContent>
-                      </Tooltip>
+                      <button
+                        className='flex items-center justify-center rounded-full bg-pink-50 p-1 text-brand-pink hover:bg-pink-100 transition-colors'
+                        aria-label="Edit your line manager's details"
+                        onClick={() => setIsEditingContact(true)}
+                        type='button'
+                      >
+                        <Edit2 size={12} />
+                      </button>
                     )}
                   </div>
 
+                  <div className='overflow-hidden transition-height duration-300' style={{height: isEditingContact ? `${managerEditHeight}px` : `${managerViewHeight}px`}}>
                   {isEditingContact ? (
-                    <div className='space-y-2'>
+                    <div className='space-y-2' ref={managerEditRef}>
                       <div>
-                        <Input
+                        <label
+                          htmlFor='managerName'
+                          className='block text-xs font-medium text-gray-500 mb-0.5'
+                        >
+                          Manager's Name
+                        </label>
+                        <input
+                          id='managerName'
                           value={managerNameInput}
                           onChange={(e) => setManagerNameInput(e.target.value)}
                           placeholder="Manager's name"
                           aria-label='Manager Name'
-                          className='w-full border-pink-200 focus:border-brand-pink text-sm mb-1'
+                          className='w-full h-8 rounded-md border border-pink-200 focus:border-brand-pink text-gray-500 text-sm px-2'
                         />
                       </div>
                       <div>
-                        <Input
+                        <label
+                          htmlFor='managerEmail'
+                          className='block text-xs font-medium text-gray-500 mb-0.5'
+                        >
+                          Manager's Email
+                        </label>
+                        <input
+                          id='managerEmail'
                           value={managerEmailInput}
                           onChange={(e) => setManagerEmailInput(e.target.value)}
                           placeholder="Manager's email"
                           aria-label='Manager Email'
-                          className='w-full border-pink-200 focus:border-brand-pink text-sm'
+                          className='w-full h-8 rounded-md border border-pink-200 focus:border-brand-pink  text-gray-500 text-sm px-2'
                         />
                         {emailError && (
                           <div className='text-red-500 text-xs mt-0.5'>
@@ -235,20 +355,20 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
                           </div>
                         )}
                       </div>
-                      <div className='flex space-x-2'>
+                      <div className='flex justify-end space-x-2'>
                         <Button
                           onClick={handleSaveContact}
                           variant='pink'
                           size='sm'
                           aria-label='Save Contact'
-                          className='px-2 py-0.5 h-auto text-xs'
+                          className='px-2 py-0.5 h-6 text-xs'
                           disabled={
                             managerEmailInput.trim() !== '' &&
                             !validateEmail(managerEmailInput.trim())
                           }
                           type='button'
                         >
-                          <Save size={12} className='mr-1' />
+                          <Save size={10} className='mr-1' />
                           Save
                         </Button>
                         <Button
@@ -261,16 +381,16 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
                           variant='outline'
                           size='sm'
                           aria-label='Cancel Editing'
-                          className='px-2 py-0.5 h-auto text-xs'
+                          className='px-2 py-0.5 h-6 text-xs'
                           type='button'
                         >
-                          <X size={12} className='mr-1' />
+                          <X size={10} className='mr-1' />
                           Cancel
                         </Button>
                       </div>
                     </div>
                   ) : (
-                    <div className='text-sm'>
+                    <div className='text-sm' ref={managerViewRef}>
                       <div className='bg-pink-50 px-2 py-1 rounded-md mb-1'>
                         <span className='text-xs text-gray-500'>Name:</span>{' '}
                         <span className='font-medium text-gray-800 break-words'>
@@ -285,23 +405,24 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
                       </div>
                     </div>
                   )}
+                  </div>
                 </div>
               </div>
 
               {/* Right column for desktop (Progress) */}
               <div className='sm:w-1/2 flex sm:self-stretch'>
                 {/* Progress section */}
-                <div className='bg-white rounded-lg p-3 shadow-sm border border-pink-100 w-full'>
+                <div className='bg-white rounded-lg p-2 shadow-sm border border-pink-100 w-full transition-all duration-300'>
                   <div className='flex items-center justify-between mb-2'>
                     <div className='flex items-center'>
-                      <Award size={16} className='text-brand-pink mr-1' />
+                      <Award size={14} className='text-brand-pink mr-1' />
                       <div className='text-xs font-semibold text-gray-700'>
                         Your progress
                       </div>
                     </div>
                     <QuestionCounter />
                   </div>
-                  <div className='bg-pink-50 p-2 sm:p-4 rounded-lg'>
+                  <div className='bg-pink-50 p-2 rounded-lg'>
                     <ProgressWithFeedback />
                   </div>
                 </div>
@@ -309,23 +430,23 @@ const UserDataModal: React.FC<UserDataModalProps> = ({ onOpenChange }) => {
             </div>
 
             {/* Sign Out and Close buttons in a row at the bottom */}
-            <div className='flex justify-between mt-4'>
+            <div className='flex justify-between mt-2'>
               <Button
                 variant='outline'
-                className='px-4'
+                className='px-3 py-1 h-8 text-xs'
                 type='button'
                 onClick={() => onOpenChange(false)}
               >
-                <X size={16} className='mr-1.5' />
+                <X size={12} className='mr-1' />
                 Close
               </Button>
 
               <button
                 onClick={handleSignOut}
-                className='flex items-center justify-center py-2 px-4 rounded-md border border-pink-100 text-red-600 hover:bg-red-50 transition-colors'
+                className='flex items-center justify-center py-1 px-3 h-8 rounded-md border border-pink-100 text-red-600 hover:bg-red-50 transition-colors text-xs'
                 type='button'
               >
-                <LogOut size={16} className='mr-1.5' />
+                <LogOut size={12} className='mr-1' />
                 <span className='font-medium'>Sign Out</span>
               </button>
             </div>
diff --git a/src/components/ui/better-tooltip.tsx b/src/components/ui/better-tooltip.tsx
index 41ae74a..75eba2d 100644
--- a/src/components/ui/better-tooltip.tsx
+++ b/src/components/ui/better-tooltip.tsx
@@ -9,12 +9,14 @@ const TooltipContext = React.createContext<{
   content: React.ReactNode;
   setContent: (content: React.ReactNode) => void;
   triggerRef: React.RefObject<HTMLDivElement>;
+  isMobile: boolean;
 }>({
   open: false,
   setOpen: () => {},
   content: null,
   setContent: () => {},
   triggerRef: { current: null },
+  isMobile: false,
 });
 
 // Provider component
@@ -23,10 +25,31 @@ export const TooltipProvider: React.FC<{ children: React.ReactNode }> = ({ child
 };
 
 // Main tooltip component
-export const Tooltip: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+export const Tooltip: React.FC<{ 
+  children: React.ReactNode; 
+  mobileInline?: boolean; // Whether to show inline on mobile
+}> = ({ children, mobileInline = false }) => {
   const [open, setOpen] = useState(false);
   const [content, setContent] = useState<React.ReactNode>(null);
   const triggerRef = useRef<HTMLDivElement>(null);
+  const [isMobile, setIsMobile] = useState(false);
+
+  // Check if we're on mobile
+  useEffect(() => {
+    const checkIfMobile = () => {
+      setIsMobile(window.innerWidth < 640); // sm breakpoint in Tailwind
+    };
+    
+    // Initial check
+    checkIfMobile();
+    
+    // Set up listener for window resize
+    window.addEventListener('resize', checkIfMobile);
+    
+    return () => {
+      window.removeEventListener('resize', checkIfMobile);
+    };
+  }, []);
 
   // Parse children to find TooltipTrigger and TooltipContent
   let triggerElement: React.ReactElement | null = null;
@@ -49,10 +72,25 @@ export const Tooltip: React.FC<{ children: React.ReactNode }> = ({ children }) =
     }
   }, [contentElement]);
 
+  // If we're on mobile and set to inline mode, we'll render differently
+  const isInlineMode = isMobile && mobileInline;
+
   return (
-    <TooltipContext.Provider value={{ open, setOpen, content, setContent, triggerRef }}>
+    <TooltipContext.Provider value={{ open, setOpen, content, setContent, triggerRef, isMobile }}>
       {triggerElement}
-      {open && content && <TooltipPortal />}
+      {content && (
+        <>
+          {/* Show regular tooltip on desktop or when mobile but not inline */}
+          {open && !isInlineMode && <TooltipPortal />}
+
+          {/* Show inline tooltip directly below trigger on mobile when inline mode is enabled */}
+          {open && isInlineMode && (
+            <div className="mt-1 p-2 bg-gray-100 rounded-md text-xs text-gray-700 border border-gray-200 max-w-[250px] break-words">
+              {content}
+            </div>
+          )}
+        </>
+      )}
     </TooltipContext.Provider>
   );
 };
@@ -62,7 +100,27 @@ export const TooltipTrigger: React.FC<{
   children: React.ReactNode; 
   asChild?: boolean;
 }> = ({ children }) => {
-  const { setOpen, triggerRef } = React.useContext(TooltipContext);
+  const { setOpen, triggerRef, isMobile } = React.useContext(TooltipContext);
+
+  // Handle touch events for mobile
+  const handleTouch = (event: React.TouchEvent) => {
+    event.preventDefault();
+    setOpen(true);
+    
+    // Set a timeout to close the tooltip after 3 seconds on mobile
+    if (isMobile) {
+      setTimeout(() => {
+        setOpen(false);
+      }, 3000);
+    }
+
+    // Add a one-time click listener to close the tooltip when touching elsewhere
+    document.addEventListener('touchstart', (e) => {
+      if (triggerRef.current && !triggerRef.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    }, { once: true });
+  };
 
   return (
     <div
@@ -71,6 +129,7 @@ export const TooltipTrigger: React.FC<{
       onMouseLeave={() => setOpen(false)}
       onFocus={() => setOpen(true)}
       onBlur={() => setOpen(false)}
+      onTouchStart={handleTouch}
       className="inline-block"
     >
       {children}
@@ -92,7 +151,7 @@ export const TooltipContent: React.FC<{
 
 // Portal component that actually renders the tooltip
 const TooltipPortal: React.FC = () => {
-  const { open, content, triggerRef } = React.useContext(TooltipContext);
+  const { open, content, triggerRef, isMobile } = React.useContext(TooltipContext);
   const tooltipRef = useRef<HTMLDivElement>(null);
   const [position, setPosition] = useState({ top: 0, left: 0 });
 
@@ -103,10 +162,40 @@ const TooltipPortal: React.FC = () => {
     const updatePosition = () => {
       const triggerRect = triggerRef.current!.getBoundingClientRect();
       const tooltipRect = tooltipRef.current!.getBoundingClientRect();
-
-      // Default positioning (above the element)
-      const top = triggerRect.top - tooltipRect.height - 5;
-      const left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
+      const windowWidth = window.innerWidth;
+
+      // Default positioning variables
+      let top, left;
+
+      // Different positioning for mobile vs desktop
+      if (isMobile) {
+        // On mobile, position below the element by default
+        top = triggerRect.bottom + 5;
+        
+        // Center horizontally, but ensure it doesn't go offscreen
+        left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
+
+        // Make sure tooltip stays within screen bounds
+        if (left < 10) left = 10;
+        if (left + tooltipRect.width > windowWidth - 10) {
+          left = windowWidth - tooltipRect.width - 10;
+        }
+      } else {
+        // Desktop positioning (above the element)
+        top = triggerRect.top - tooltipRect.height - 5;
+        left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
+        
+        // Adjust if tooltip would go off screen
+        if (left < 10) left = 10;
+        if (left + tooltipRect.width > windowWidth - 10) {
+          left = windowWidth - tooltipRect.width - 10;
+        }
+        
+        // If tooltip would go off the top of the screen, position below instead
+        if (top < 10) {
+          top = triggerRect.bottom + 5;
+        }
+      }
 
       // Adjust for scroll position
       setPosition({
@@ -123,7 +212,7 @@ const TooltipPortal: React.FC = () => {
       window.removeEventListener('resize', updatePosition);
       window.removeEventListener('scroll', updatePosition);
     };
-  }, [open, triggerRef.current, tooltipRef.current]);
+  }, [open, triggerRef.current, tooltipRef.current, isMobile]);
 
   if (!open) return null;
 
@@ -131,13 +220,15 @@ const TooltipPortal: React.FC = () => {
     <div
       ref={tooltipRef}
       className={cn(
-        'z-50 overflow-hidden rounded-md border bg-white px-3 py-1.5 text-sm shadow-md',
-        'absolute'
+        'z-50 overflow-hidden rounded-md border bg-white shadow-md absolute',
+        isMobile ? 'px-2 py-1 text-xs max-w-[250px]' : 'px-3 py-1.5 text-sm'
       )}
       style={{
         top: `${position.top}px`,
         left: `${position.left}px`,
         zIndex: 9999,
+        maxWidth: isMobile ? '250px' : 'auto',
+        wordWrap: 'break-word',
       }}
     >
       {content}
diff --git a/src/components/ui/buttonVariants.ts b/src/components/ui/buttonVariants.ts
index db6c621..16c724c 100644
--- a/src/components/ui/buttonVariants.ts
+++ b/src/components/ui/buttonVariants.ts
@@ -1,7 +1,7 @@
 import { cva } from 'class-variance-authority';
 
 export const buttonVariants = cva(
-  'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+  'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50',
   {
     variants: {
       variant: {
@@ -10,9 +10,9 @@ export const buttonVariants = cva(
         destructive:
           'bg-destructive text-destructive-foreground hover:bg-destructive/90',
         outline:
-          'border border-pink-200 bg-white text-gray-700  hover:border-pink-300 transition-colors',
+          'border-3 border-gray-200 bg-white text-gray-700 hover:border-gray-300 transition-colors focus:border-gray-300 focus-visible:border-gray-300',
         outlineVerbs:
-          'border border-pink-200 bg-white text-gray-700 hover:bg-brand-pink hover:border-pink-300 transition-colors',
+          'border-3 border-gray-200 bg-white text-gray-700 hover:bg-gray-100 hover:border-gray-300 transition-colors',
         secondary:
           'bg-pink-100 text-brand-pink border border-pink-200  transition-colors',
         ghost: 'hover:bg-pink-50 hover:text-brand-pink transition-colors',
@@ -32,8 +32,8 @@ export const buttonVariants = cva(
         compact: 'h-8 px-3 py-1',
       },
       selected: {
-        true: 'bg-[var(--tile-color)]',
-        false: '',
+        true: 'border-3 border-[var(--tile-color)] bg-[var(--tile-color)] bg-opacity-20 focus:ring-0 focus:border-[var(--tile-color)] focus-visible:ring-0',
+        false: 'border-3 border-gray-200 focus:ring-0 focus-visible:ring-0',
       },
     },
     defaultVariants: {
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index b149f19..38d70f0 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -10,7 +10,7 @@ const Input = React.forwardRef<
     <input
       type={type}
       className={cn(
-        'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-gray-900 ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+        'flex h-10 w-full rounded-md border border-input bg-background px-2 py-2 text-sm text-gray-900 ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
         className
       )}
       ref={ref}
diff --git a/src/components/ui/simple-dialog-context.tsx b/src/components/ui/simple-dialog-context.tsx
new file mode 100644
index 0000000..d75301f
--- /dev/null
+++ b/src/components/ui/simple-dialog-context.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+
+// Context for communicating between Dialog and DialogTrigger
+export const SimpleDialogContext = React.createContext<{
+  isOpen: boolean;
+  onOpenChange: (open: boolean) => void;
+}>({
+  isOpen: false,
+  onOpenChange: () => {},
+});
\ No newline at end of file
diff --git a/src/components/ui/simple-dialog.tsx b/src/components/ui/simple-dialog.tsx
index 2e4cfd7..e13021d 100644
--- a/src/components/ui/simple-dialog.tsx
+++ b/src/components/ui/simple-dialog.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react';
 import { cn } from '@/lib/utils';
+import { SimpleDialogContext } from './simple-dialog-context';
 
 interface SimpleDialogProps {
   isOpen?: boolean;
@@ -13,7 +14,7 @@ interface SimpleDialogContentProps {
   children: React.ReactNode;
   className?: string;
   headerTitle?: string;
-  onOpenAutoFocus?: (e: any) => void;
+  onOpenAutoFocus?: (e: Event) => void;
   onEscapeKeyDown?: () => void;
   onPointerDownOutside?: () => void;
 }
@@ -54,16 +55,18 @@ const SimpleDialogOverlay: React.FC<{ className?: string; onClick?: () => void }
 
 const SimpleDialogContent = React.forwardRef<HTMLDivElement, SimpleDialogContentProps>(
   ({ className, children, headerTitle, onOpenAutoFocus, ...props }, ref) => {
-    if (onOpenAutoFocus) {
-      // Prevent auto focus
-      useEffect(() => {
-        const handler = (e: FocusEvent) => {
-          if (onOpenAutoFocus) onOpenAutoFocus(e);
+    // Always define the useEffect, but make its behavior conditional inside
+    useEffect(() => {
+      if (onOpenAutoFocus) {
+        const handler = (e: Event) => {
+          onOpenAutoFocus(e);
         };
         document.addEventListener('focus', handler, { once: true });
         return () => document.removeEventListener('focus', handler);
-      }, [onOpenAutoFocus]);
-    }
+      }
+      // Return empty cleanup function when onOpenAutoFocus is not provided
+      return () => {};
+    }, [onOpenAutoFocus]);
 
     // Stop click propagation to prevent closing the dialog when clicking content
     const handleContentClick = (e: React.MouseEvent) => {
@@ -74,13 +77,23 @@ const SimpleDialogContent = React.forwardRef<HTMLDivElement, SimpleDialogContent
       <div
         ref={ref}
         className={cn(
-          'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border-0 bg-background p-0 shadow-lg duration-200',
+          'fixed left-[50%] top-[50%] z-50 flex flex-col w-full translate-x-[-50%] translate-y-[-50%] border-0 bg-background p-0 shadow-lg duration-200',
+          'max-w-[95vw] max-h-[90vh] sm:max-w-lg rounded-lg overflow-hidden',
           className
         )}
         onClick={handleContentClick}
         {...props}
       >
-        {children}
+        {/* If there's a header title, add it as a styled header */}
+        {headerTitle && (
+          <div className="flex items-center justify-between bg-brand-pink p-2 sm:p-4 flex-shrink-0">
+            <h2 className="text-base sm:text-lg font-semibold text-white">{headerTitle}</h2>
+          </div>
+        )}
+        {/* Main content with scroll capability */}
+        <div className="overflow-y-auto flex-grow">
+          {children}
+        </div>
       </div>
     );
   }
@@ -108,20 +121,13 @@ const SimpleDialogTitle: React.FC<SimpleDialogTitleProps> = ({ children, classNa
 
 const SimpleDialogDescription: React.FC<SimpleDialogDescriptionProps> = ({ children, className }) => {
   return (
-    <p className={cn('text-sm text-muted-foreground', className)}>
+    <p className={cn('text-xs sm:text-sm text-muted-foreground mt-1 mb-2 sm:mb-3', className)}>
       {children}
     </p>
   );
 };
 
-// Context for communicating between Dialog and DialogTrigger
-export const SimpleDialogContext = React.createContext<{
-  isOpen: boolean;
-  onOpenChange: (open: boolean) => void;
-}>({
-  isOpen: false,
-  onOpenChange: () => {},
-});
+// Context is now imported from separate file
 
 const SimpleDialogTrigger: React.FC<SimpleDialogTriggerProps> = ({ children }) => {
   // Get the dialog context to control the dialog's open state
diff --git a/src/components/ui/simple-dropdown.tsx b/src/components/ui/simple-dropdown.tsx
index 98a401d..ea23c1d 100644
--- a/src/components/ui/simple-dropdown.tsx
+++ b/src/components/ui/simple-dropdown.tsx
@@ -127,7 +127,7 @@ const SimpleDropdownMenuContent = React.forwardRef<HTMLDivElement, SimpleDropdow
       <div 
         ref={ref}
         className={cn(
-          'absolute z-50 min-w-[10rem] overflow-hidden rounded-md border bg-white p-2 shadow-md',
+          'absolute z-[9999] min-w-[10rem] overflow-hidden rounded-md border bg-white p-2 shadow-md',
           'top-full right-0 mt-1',
           className
         )}
diff --git a/src/components/ui/simple-tooltip.tsx b/src/components/ui/simple-tooltip.tsx
index 17273e9..30c6287 100644
--- a/src/components/ui/simple-tooltip.tsx
+++ b/src/components/ui/simple-tooltip.tsx
@@ -8,6 +8,7 @@ interface SimpleTooltipProps {
   delayDuration?: number;
   side?: 'top' | 'right' | 'bottom' | 'left';
   sideOffset?: number;
+  mobileInline?: boolean; // Display tooltip inline below element on mobile
 }
 
 // Simple provider that doesn't actually do anything
@@ -23,40 +24,86 @@ const SimpleTooltip: React.FC<SimpleTooltipProps> = ({
   delayDuration = 300,
   side = 'top',
   sideOffset = 4,
+  mobileInline = false,
 }) => {
   const [isVisible, setIsVisible] = useState(false);
   const [position, setPosition] = useState({ top: 0, left: 0 });
+  const [isMobile, setIsMobile] = useState(false);
   const triggerRef = useRef<HTMLDivElement>(null);
   const tooltipRef = useRef<HTMLDivElement>(null);
   const timeoutRef = useRef<NodeJS.Timeout | null>(null);
 
+  // Check if we're on mobile
+  useEffect(() => {
+    const checkIfMobile = () => {
+      setIsMobile(window.innerWidth < 640); // sm breakpoint in Tailwind
+    };
+    
+    // Initial check
+    checkIfMobile();
+    
+    // Set up listener for window resize
+    window.addEventListener('resize', checkIfMobile);
+    
+    return () => {
+      window.removeEventListener('resize', checkIfMobile);
+    };
+  }, []);
+
   // Calculate position based on trigger element
   const updatePosition = () => {
     if (!triggerRef.current || !tooltipRef.current) return;
 
     const triggerRect = triggerRef.current.getBoundingClientRect();
     const tooltipRect = tooltipRef.current.getBoundingClientRect();
+    const windowWidth = window.innerWidth;
     
     let top = 0;
     let left = 0;
 
-    switch (side) {
-      case 'top':
-        top = triggerRect.top - tooltipRect.height - sideOffset;
-        left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
-        break;
-      case 'bottom':
+    // Different positioning for mobile
+    if (isMobile && side !== 'bottom') {
+      // On mobile, prefer positioning below the element
+      top = triggerRect.bottom + sideOffset;
+      // Center horizontally but ensure it doesn't go off screen
+      left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
+      
+      // Make sure tooltip stays within screen bounds
+      if (left < 10) left = 10;
+      if (left + tooltipRect.width > windowWidth - 10) {
+        left = windowWidth - tooltipRect.width - 10;
+      }
+    } else {
+      // Desktop or explicit bottom positioning
+      switch (side) {
+        case 'top':
+          top = triggerRect.top - tooltipRect.height - sideOffset;
+          left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
+          break;
+        case 'bottom':
+          top = triggerRect.bottom + sideOffset;
+          left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
+          break;
+        case 'left':
+          top = triggerRect.top + (triggerRect.height - tooltipRect.height) / 2;
+          left = triggerRect.left - tooltipRect.width - sideOffset;
+          break;
+        case 'right':
+          top = triggerRect.top + (triggerRect.height - tooltipRect.height) / 2;
+          left = triggerRect.right + sideOffset;
+          break;
+      }
+      
+      // Adjust if tooltip would go off screen
+      if (left < 10) left = 10;
+      if (left + tooltipRect.width > windowWidth - 10) {
+        left = windowWidth - tooltipRect.width - 10;
+      }
+      
+      // If tooltip would go off the top of the screen, position below instead
+      if (top < 10) {
         top = triggerRect.bottom + sideOffset;
-        left = triggerRect.left + (triggerRect.width - tooltipRect.width) / 2;
-        break;
-      case 'left':
-        top = triggerRect.top + (triggerRect.height - tooltipRect.height) / 2;
-        left = triggerRect.left - tooltipRect.width - sideOffset;
-        break;
-      case 'right':
-        top = triggerRect.top + (triggerRect.height - tooltipRect.height) / 2;
-        left = triggerRect.right + sideOffset;
-        break;
+      }
     }
 
     // Adjust for scroll
@@ -81,12 +128,35 @@ const SimpleTooltip: React.FC<SimpleTooltipProps> = ({
     setIsVisible(false);
   };
 
+  // Handle touch events for mobile
+  const handleTouch = (event: React.TouchEvent) => {
+    event.preventDefault();
+    showTooltip();
+    
+    // Set a timeout to close the tooltip after 3 seconds on mobile
+    if (isMobile) {
+      setTimeout(() => {
+        hideTooltip();
+      }, 3000);
+    }
+
+    // Add a one-time click listener to close the tooltip when touching elsewhere
+    document.addEventListener('touchstart', (e) => {
+      if (triggerRef.current && !triggerRef.current.contains(e.target as Node)) {
+        hideTooltip();
+      }
+    }, { once: true });
+  };
+
   useEffect(() => {
     return () => {
       if (timeoutRef.current) clearTimeout(timeoutRef.current);
     };
   }, []);
 
+  // If we're on mobile and inline mode is enabled
+  const isInlineMode = isMobile && mobileInline;
+
   return (
     <>
       <div
@@ -95,10 +165,13 @@ const SimpleTooltip: React.FC<SimpleTooltipProps> = ({
         onMouseLeave={hideTooltip}
         onFocus={showTooltip}
         onBlur={hideTooltip}
+        onTouchStart={handleTouch}
       >
         {children}
       </div>
-      {isVisible && (
+      
+      {/* Regular tooltip (desktop or mobile non-inline) */}
+      {isVisible && !isInlineMode && (
         <div
           ref={tooltipRef}
           style={{
@@ -106,15 +179,25 @@ const SimpleTooltip: React.FC<SimpleTooltipProps> = ({
             top: `${position.top}px`,
             left: `${position.left}px`,
             zIndex: 9999,
+            maxWidth: isMobile ? '250px' : 'auto',
+            wordWrap: 'break-word',
           }}
           className={cn(
-            'z-50 overflow-hidden rounded-md border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md',
+            'z-50 overflow-hidden rounded-md border bg-white shadow-md',
+            isMobile ? 'px-2 py-1 text-xs' : 'px-3 py-1.5 text-sm',
             className
           )}
         >
           {content}
         </div>
       )}
+      
+      {/* Inline tooltip (mobile only) */}
+      {isVisible && isInlineMode && (
+        <div className="mt-1 p-2 bg-gray-100 rounded-md text-xs text-gray-700 border border-gray-200 max-w-[250px] break-words">
+          {content}
+        </div>
+      )}
     </>
   );
 };
diff --git a/src/components/ui/tour/HelpButton.tsx b/src/components/ui/tour/HelpButton.tsx
new file mode 100644
index 0000000..73f7a2a
--- /dev/null
+++ b/src/components/ui/tour/HelpButton.tsx
@@ -0,0 +1,46 @@
+'use client';
+
+import React, { useState, useEffect } from 'react';
+import { HelpCircle } from 'lucide-react';
+
+interface HelpButtonProps {
+  onClick: () => void;
+  shouldPulse?: boolean;
+}
+
+const HelpButton: React.FC<HelpButtonProps> = ({
+  onClick,
+  shouldPulse = false,
+}) => {
+  const [isPulsing, setIsPulsing] = useState(false);
+
+  // Start pulsing animation when shouldPulse changes to true
+  useEffect(() => {
+    if (shouldPulse) {
+      setIsPulsing(true);
+
+      // Stop pulsing after 3 seconds
+      const timer = setTimeout(() => {
+        setIsPulsing(false);
+      }, 3500);
+
+      return () => clearTimeout(timer);
+    }
+  }, [shouldPulse]);
+
+  return (
+    <button
+      onClick={() => {
+        setIsPulsing(false); // Stop pulsing when clicked
+        onClick();
+      }}
+      className={`fixed bottom-8 left-4 z-40 rounded-full flex items-center p-2 shadow-lg bg-blue-600 hover:bg-blue-700 transition-all duration-150 focus:outline-none focus:ring-2 focus:ring-blue-400
+        ${isPulsing ? 'help-button-pulse' : ''}`}
+      aria-label='Help'
+    >
+      <HelpCircle className='w-6 h-6 text-white' />
+    </button>
+  );
+};
+
+export default HelpButton;
diff --git a/src/components/ui/tour/HelpCenter.tsx b/src/components/ui/tour/HelpCenter.tsx
new file mode 100644
index 0000000..e101149
--- /dev/null
+++ b/src/components/ui/tour/HelpCenter.tsx
@@ -0,0 +1,275 @@
+'use client';
+
+import React, { useState } from 'react';
+import { X, Info, PlayCircle, BookOpen, History } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import helpContent from '@/data/helpContent.json';
+
+interface HelpCenterProps {
+  onClose: () => void;
+  initialTab?: string;
+}
+
+type TabType = 'welcome' | 'tutorials' | 'features' | 'versions';
+
+const HelpCenter: React.FC<HelpCenterProps> = ({
+  onClose,
+  initialTab = 'welcome',
+}) => {
+  const [activeTab, setActiveTab] = useState<TabType>(initialTab as TabType);
+  const [visible, setVisible] = useState(false);
+
+  // Fade-in animation
+  React.useEffect(() => {
+    const timer = setTimeout(() => setVisible(true), 100);
+    return () => clearTimeout(timer);
+  }, []);
+
+  // Handle tab change
+  const handleTabChange = (tab: TabType) => {
+    setActiveTab(tab);
+  };
+
+  // YouTube video player
+  const VideoPlayer = ({
+    videoId,
+    title,
+  }: {
+    videoId: string;
+    title: string;
+  }) => (
+    <div className='relative aspect-video bg-gray-100 rounded-lg overflow-hidden mb-3'>
+      <iframe
+        src={`https://www.youtube-nocookie.com/embed/${videoId}?playsinline=1&rel=0`}
+        title={title}
+        className='absolute inset-0 w-full h-full'
+        allow='accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture'
+        allowFullScreen
+        loading='lazy'
+        referrerPolicy='no-referrer-when-downgrade'
+      ></iframe>
+    </div>
+  );
+
+  return (
+    <div className='fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/50'>
+      <div
+        className={`bg-white rounded-lg shadow-xl w-full max-w-2xl transform transition-all duration-300 max-h-[90vh] flex flex-col ${
+          visible ? 'translate-y-0 opacity-100' : 'translate-y-4 opacity-0'
+        }`}
+      >
+        {/* Header */}
+        <div className='flex items-center justify-between p-4 border-b'>
+          <h2 className='text-xl font-semibold flex items-center text-brand-blue'>
+            <Info className='w-5 h-5 mr-2' />
+            Help Center
+          </h2>
+          <button
+            onClick={onClose}
+            className='text-gray-500 hover:text-gray-700 focus:outline-none'
+          >
+            <X className='w-5 h-5' />
+          </button>
+        </div>
+
+        {/* Tabs - grid for mobile, flex for desktop */}
+        <div className='grid grid-cols-4 sm:flex border-b'>
+          <button
+            className={`px-2 sm:px-4 py-2 font-medium text-xs sm:text-sm flex flex-col sm:flex-row items-center justify-center ${
+              activeTab === 'welcome'
+                ? 'text-brand-blue border-b-2 border-brand-blue'
+                : 'text-gray-500 hover:text-gray-700'
+            }`}
+            onClick={() => handleTabChange('welcome')}
+          >
+            <Info className='w-4 h-4 sm:mr-1 mb-1 sm:mb-0' />
+            <span>About</span>
+          </button>
+          <button
+            className={`px-2 sm:px-4 py-2 font-medium text-xs sm:text-sm flex flex-col sm:flex-row items-center justify-center ${
+              activeTab === 'tutorials'
+                ? 'text-brand-blue border-b-2 border-brand-blue'
+                : 'text-gray-500 hover:text-gray-700'
+            }`}
+            onClick={() => handleTabChange('tutorials')}
+          >
+            <PlayCircle className='w-4 h-4 sm:mr-1 mb-1 sm:mb-0' />
+            <span>Tutorials</span>
+          </button>
+          <button
+            className={`px-2 sm:px-4 py-2 font-medium text-xs sm:text-sm flex flex-col sm:flex-row items-center justify-center ${
+              activeTab === 'features'
+                ? 'text-brand-blue border-b-2 border-brand-blue'
+                : 'text-gray-500 hover:text-gray-700'
+            }`}
+            onClick={() => handleTabChange('features')}
+          >
+            <BookOpen className='w-4 h-4 sm:mr-1 mb-1 sm:mb-0' />
+            <span>Features</span>
+          </button>
+          <button
+            className={`px-2 sm:px-4 py-2 font-medium text-xs sm:text-sm flex flex-col sm:flex-row items-center justify-center ${
+              activeTab === 'versions'
+                ? 'text-brand-blue border-b-2 border-brand-blue'
+                : 'text-gray-500 hover:text-gray-700'
+            }`}
+            onClick={() => handleTabChange('versions')}
+          >
+            <History className='w-4 h-4 sm:mr-1 mb-1 sm:mb-0' />
+            <span>Versions</span>
+          </button>
+        </div>
+
+        {/* Content - scrollable */}
+        <div className='flex-1 overflow-y-auto p-5'>
+          {/* Welcome Tab */}
+          {activeTab === 'welcome' && (
+            <div>
+              <h3 className='text-lg font-medium text-gray-800 mb-3'>
+                {helpContent.welcome.title}
+              </h3>
+              <p className='text-gray-700 mb-4'>
+                {helpContent.welcome.description}
+              </p>
+
+              <h4 className='font-medium text-gray-800 mb-2'>Key Benefits:</h4>
+              <ul className='list-disc pl-5 space-y-1 mb-5 text-gray-700'>
+                {helpContent.welcome.keyBenefits.map((benefit, index) => (
+                  <li key={index}>{benefit}</li>
+                ))}
+              </ul>
+            </div>
+          )}
+
+          {/* Tutorials Tab */}
+          {activeTab === 'tutorials' && (
+            <div>
+              <h3 className='text-lg font-medium text-gray-800 mb-3'>
+                Tutorial Videos
+              </h3>
+
+              <div className='space-y-6'>
+                {/* Desktop Tutorial */}
+                <div className='bg-gray-50 p-4 rounded-lg'>
+                  <h4 className='font-medium text-gray-800 mb-2'>
+                    {helpContent.tutorials.desktop.title}
+                  </h4>
+                  <VideoPlayer
+                    videoId='B0V24-WaYH0'
+                    title={helpContent.tutorials.desktop.title}
+                  />
+                  <p className='text-gray-700'>
+                    {helpContent.tutorials.desktop.description}
+                  </p>
+                </div>
+
+                {/* Mobile Tutorial */}
+                <div className='bg-gray-50 p-4 rounded-lg'>
+                  <h4 className='font-medium text-gray-800 mb-2'>
+                    {helpContent.tutorials.mobile.title}
+                  </h4>
+                  <VideoPlayer
+                    videoId='B0V24-WaYH0'
+                    title={helpContent.tutorials.mobile.title}
+                  />
+                  <p className='text-gray-700'>
+                    {helpContent.tutorials.mobile.description}
+                  </p>
+                </div>
+              </div>
+            </div>
+          )}
+
+          {/* Features Tab */}
+          {activeTab === 'features' && (
+            <div>
+              <h3 className='text-lg font-medium text-gray-800 mb-3'>
+                Features & How-To
+              </h3>
+
+              <div className='space-y-6'>
+                {helpContent.features.map((feature, index) => (
+                  <div key={index} className='bg-gray-50 p-4 rounded-lg'>
+                    <h4 className='font-medium text-gray-800 mb-2'>
+                      {feature.title}
+                    </h4>
+                    <p className='text-gray-700 mb-3'>{feature.description}</p>
+                    {feature.details && (
+                      <p className='text-gray-700 mb-3'>{feature.details}</p>
+                    )}
+                    {feature.steps && (
+                      <>
+                        <h5 className='font-medium text-gray-800 mb-1'>
+                          Steps:
+                        </h5>
+                        <ol className='list-decimal pl-5 space-y-1 text-gray-700'>
+                          {feature.steps.map((step, stepIndex) => (
+                            <li key={stepIndex}>{step}</li>
+                          ))}
+                        </ol>
+                      </>
+                    )}
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+
+          {/* Versions Tab */}
+          {activeTab === 'versions' && (
+            <div>
+              <h3 className='text-lg font-medium text-gray-800 mb-3'>
+                Version History
+              </h3>
+
+              <div className='space-y-6'>
+                {helpContent.versions.map((version, index) => (
+                  <div key={index} className='bg-gray-50 p-4 rounded-lg'>
+                    <h4 className='font-medium text-gray-800 mb-2'>
+                      Version {version.version}{' '}
+                      <span className='text-gray-500 font-normal'>
+                        ({version.date})
+                      </span>
+                    </h4>
+                    <ul className='space-y-1'>
+                      {version.changes.map((change, changeIndex) => (
+                        <li
+                          key={changeIndex}
+                          className='flex items-start gap-2'
+                        >
+                          <span
+                            className={`inline-block px-2 py-0.5 text-xs rounded ${
+                              change.type === 'feature'
+                                ? 'bg-green-100 text-green-800'
+                                : change.type === 'fix'
+                                ? 'bg-blue-100 text-blue-800'
+                                : 'bg-gray-100 text-gray-800'
+                            }`}
+                          >
+                            {change.type}
+                          </span>
+                          <span className='text-gray-700'>
+                            {change.description}
+                          </span>
+                        </li>
+                      ))}
+                    </ul>
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+
+        {/* Footer */}
+        <div className='border-t p-4 flex justify-end'>
+          <Button variant='outline' onClick={onClose}>
+            Close
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default HelpCenter;
diff --git a/src/components/ui/tour/HelpProvider.tsx b/src/components/ui/tour/HelpProvider.tsx
new file mode 100644
index 0000000..f0deb58
--- /dev/null
+++ b/src/components/ui/tour/HelpProvider.tsx
@@ -0,0 +1,96 @@
+'use client';
+
+import React, { createContext, useContext, useState, useEffect } from 'react';
+import WelcomePanel from './WelcomePanel';
+import HelpButton from './HelpButton';
+import HelpCenter from './HelpCenter';
+
+interface HelpContextType {
+  showHelpCenter: (tab?: string) => void;
+}
+
+const HelpContext = createContext<HelpContextType | undefined>(undefined);
+
+export const useHelp = () => {
+  const context = useContext(HelpContext);
+  if (!context) {
+    throw new Error('useHelp must be used within a HelpProvider');
+  }
+  return context;
+};
+
+interface HelpProviderProps {
+  children: React.ReactNode;
+}
+
+export const HelpProvider: React.FC<HelpProviderProps> = ({ children }) => {
+  const [showWelcome, setShowWelcome] = useState(false);
+  const [showCenter, setShowCenter] = useState(false);
+  const [activeTab, setActiveTab] = useState('welcome');
+  const [shouldPulseButton, setShouldPulseButton] = useState(false);
+
+  // Check if this is the first visit
+  useEffect(() => {
+    const hasVisitedBefore = localStorage.getItem('app_visited');
+    if (!hasVisitedBefore) {
+      setShowWelcome(true);
+    }
+  }, []);
+
+  const handleWelcomeClose = () => {
+    setShowWelcome(false);
+    localStorage.setItem('app_visited', 'true');
+    // Pulse the help button after welcome panel closes
+    setShouldPulseButton(true);
+  };
+
+  const handleShowTutorial = () => {
+    setShowWelcome(false);
+    setActiveTab('tutorials');
+    setShowCenter(true);
+    localStorage.setItem('app_visited', 'true');
+  };
+
+  const handleHelpCenterClose = () => {
+    setShowCenter(false);
+    // Pulse the help button after help center closes
+    setShouldPulseButton(true);
+  };
+
+  const showHelpCenter = (tab = 'welcome') => {
+    setActiveTab(tab);
+    setShowCenter(true);
+    // Stop pulsing when help center opens
+    setShouldPulseButton(false);
+  };
+
+  return (
+    <HelpContext.Provider value={{ showHelpCenter }}>
+      {children}
+      
+      {/* Persistent Help Button */}
+      <HelpButton 
+        onClick={() => showHelpCenter()} 
+        shouldPulse={shouldPulseButton}
+      />
+      
+      {/* Welcome Panel (first visit) */}
+      {showWelcome && (
+        <WelcomePanel 
+          onClose={handleWelcomeClose} 
+          onShowTutorial={handleShowTutorial} 
+        />
+      )}
+      
+      {/* Help Center Panel */}
+      {showCenter && (
+        <HelpCenter 
+          onClose={handleHelpCenterClose} 
+          initialTab={activeTab}
+        />
+      )}
+    </HelpContext.Provider>
+  );
+};
+
+export default HelpProvider;
\ No newline at end of file
diff --git a/src/components/ui/tour/WelcomePanel.tsx b/src/components/ui/tour/WelcomePanel.tsx
new file mode 100644
index 0000000..cd73694
--- /dev/null
+++ b/src/components/ui/tour/WelcomePanel.tsx
@@ -0,0 +1,80 @@
+'use client';
+
+import React, { useEffect, useState } from 'react';
+import { Info, PlayCircle, ArrowRight, X } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import helpContent from '@/data/helpContent.json';
+
+interface WelcomePanelProps {
+  onClose: () => void;
+  onShowTutorial: () => void;
+}
+
+const WelcomePanel: React.FC<WelcomePanelProps> = ({
+  onClose,
+  onShowTutorial,
+}) => {
+  const [visible, setVisible] = useState(false);
+
+  // Fade-in animation
+  useEffect(() => {
+    const timer = setTimeout(() => setVisible(true), 100);
+    return () => clearTimeout(timer);
+  }, []);
+
+  return (
+    <div className='fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/50'>
+      <div
+        className={`bg-white rounded-lg shadow-xl max-w-md w-full transform transition-all duration-300 max-h-[90vh] flex flex-col ${
+          visible ? 'translate-y-0 opacity-100' : 'translate-y-4 opacity-0'
+        }`}
+      >
+        {/* Header */}
+        <div className='flex items-center justify-between p-4 border-b'>
+          <h2 className='text-xl font-semibold flex items-center text-brand-blue'>
+            <Info className='w-5 h-5 mr-2' />
+            {helpContent.welcome.title}
+          </h2>
+          <button
+            onClick={onClose}
+            className='text-gray-500 hover:text-gray-700 focus:outline-none'
+          >
+            <X className='w-5 h-5' />
+          </button>
+        </div>
+
+        {/* Content - scrollable */}
+        <div className='flex-1 overflow-y-auto p-5'>
+          <p className='text-gray-700 mb-4'>
+            {helpContent.welcome.description}
+          </p>
+
+          <h3 className='font-medium text-gray-800 mb-2'>Key benefits:</h3>
+          <ul className='list-disc pl-5 space-y-1 mb-5 text-gray-700'>
+            {helpContent.welcome.keyBenefits.map((benefit, index) => (
+              <li key={index}>{benefit}</li>
+            ))}
+          </ul>
+        </div>
+
+        {/* Footer */}
+        <div className='border-t p-4 flex flex-row gap-3'>
+          <Button variant='default' className='flex-1' onClick={onClose}>
+            Get Started
+            <ArrowRight className='w-4 h-4 ml-2' />
+          </Button>
+          <Button
+            variant='outline'
+            className='flex-1'
+            onClick={onShowTutorial}
+          >
+            Show Tutorial
+            <PlayCircle className='w-4 h-4 ml-2' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default WelcomePanel;
diff --git a/src/components/ui/tour/index.ts b/src/components/ui/tour/index.ts
new file mode 100644
index 0000000..8aa8ba7
--- /dev/null
+++ b/src/components/ui/tour/index.ts
@@ -0,0 +1,4 @@
+export { default as HelpProvider, useHelp } from './HelpProvider';
+export { default as HelpButton } from './HelpButton';
+export { default as HelpCenter } from './HelpCenter';
+export { default as WelcomePanel } from './WelcomePanel';
\ No newline at end of file
diff --git a/src/data/descriptors.json b/src/data/descriptors.json
index 219ca60..e0957fe 100644
--- a/src/data/descriptors.json
+++ b/src/data/descriptors.json
@@ -1,5 +1,10 @@
 {
   "descriptors": [
+    {
+      "name": "Example",
+      "description": "Descriptors for the tutorial",
+      "options": ["Option1", "Option2", "Option3", "Option4"]
+    },
     {
       "name": "wellbeing",
       "description": "Descriptors related to the user's mental and emotional state, including stress, energy, and overall wellbeing.",
@@ -41,7 +46,7 @@
       ]
     },
     {
-      "name": "colleagueSharing",
+      "name": "Colleague_Sharing",
       "description": "Descriptors regarding the type and level of information the user is comfortable sharing with colleagues.",
       "options": [
         "detailed sharing",
@@ -51,7 +56,7 @@
       ]
     },
     {
-      "name": "employerSupport",
+      "name": "employer_Support",
       "description": "Descriptors regarding the user's support and communication preferences from the employer.",
       "options": [
         "formal check-ins",
@@ -61,7 +66,7 @@
       ]
     },
     {
-      "name": "personalIntroduction",
+      "name": "personal_Introduction",
       "description": "Descriptors for personal introduction details that capture background, hobbies, ambitions, and other personal insights.",
       "options": [
         "family background",
diff --git a/src/data/helpContent.json b/src/data/helpContent.json
new file mode 100644
index 0000000..65248a8
--- /dev/null
+++ b/src/data/helpContent.json
@@ -0,0 +1,101 @@
+{
+  "welcome": {
+    "title": "Welcome to Beacons",
+    "description": "Beacons helps you communicate effectively with your line manager by organizing and sharing structured information about your needs, preferences, and work progress. Answer prepared questions by category or create custom statements to help them understand how to best support you.",
+    "keyBenefits": [
+      "Share important information with your line manager through structured statements",
+      "Track actions related to your statements and monitor progress",
+      "Express gratitude for completed actions with custom thank you messages",
+      "Easily compile and share all relevant information via email"
+    ]
+  },
+  "tutorials": {
+    "desktop": {
+      "title": "Desktop Tutorial",
+      "videoUrl": "/videos/desktop-tutorial.mp4",
+      "description": "Learn how to use Beacons on your desktop or laptop computer."
+    },
+    "mobile": {
+      "title": "Mobile Tutorial",
+      "videoUrl": "/videos/mobile-tutorial.mp4",
+      "description": "Learn how to use Beacons on your mobile device."
+    }
+  },
+  "features": [
+    {
+      "title": "Answering Preset Questions",
+      "description": "Answer organized questions by category to create statements that help your line manager understand your needs and preferences.",
+      "steps": [
+        "Browse questions organized by category (wellbeing, parental, religious, etc.)",
+        "Click on a question to open the statement wizard",
+        "Follow the guided steps to create your structured statement",
+        "Set the privacy level and save your statement"
+      ]
+    },
+    {
+      "title": "Creating Custom Statements",
+      "description": "Create your own custom statements when you have something specific to communicate that isn't covered by the preset questions.",
+      "steps": [
+        "Click 'Create Statement' to start",
+        "Choose a category for your statement (determines available subject options)",
+        "Select a subject, verb, and complete your statement",
+        "Set privacy level and save your statement"
+      ]
+    },
+    {
+      "title": "Managing Actions",
+      "description": "Track actions related to your statements to monitor progress and follow-up activities.",
+      "details": "Actions allow you and your line manager to track specific tasks that need to be completed in relation to your statements. This helps ensure that your needs are being addressed.",
+      "steps": [
+        "Open a statement from your statement list",
+        "Click 'Add Action' to create a new action item",
+        "Enter the action details and set a due date",
+        "Mark actions as complete when finished"
+      ]
+    },
+    {
+      "title": "Expressing Gratitude",
+      "description": "Send thank you messages for completed actions to acknowledge support from your line manager.",
+      "steps": [
+        "Find a completed action in your statements list",
+        "Click the 'Express Gratitude' option",
+        "Write a personalized thank you message",
+        "Send the gratitude message via email"
+      ]
+    },
+    {
+      "title": "Email Compilation & Sharing",
+      "description": "Compile and share all your public statements with your line manager via email.",
+      "steps": [
+        "Click the 'Share' button on your statements page",
+        "Review which statements will be shared (only public ones)",
+        "Enter your line manager's email address",
+        "Customize the message (optional)",
+        "Send your compiled statements"
+      ]
+    },
+    {
+      "title": "Privacy Control",
+      "description": "You have full control over which statements are shared with your line manager.",
+      "details": "For each statement, you can choose whether it's private (only visible to you) or public (visible to your line manager). You can change the privacy setting at any time."
+    }
+  ],
+  "versions": [
+    {
+      "version": "1.0.0",
+      "date": "2024-03-15",
+      "changes": [
+        {
+          "type": "feature",
+          "description": "Initial release of Beacons application"
+        },
+        { "type": "feature", "description": "Create and manage statements" },
+        { "type": "feature", "description": "Share statements via email" },
+        {
+          "type": "feature",
+          "description": "Privacy controls for each statement"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/data/setQuestions.json b/src/data/setQuestions.json
index 1c37fee..625d0ef 100644
--- a/src/data/setQuestions.json
+++ b/src/data/setQuestions.json
@@ -14,8 +14,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "what?",
@@ -43,8 +42,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Express",
-          "allowedVerbs": ["Express", "Share"]
+          "presetAnswer": "Express"
         },
         "object": {
           "question": "Describe your feelings and actions on a good day.",
@@ -72,8 +70,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "List any changes in behavior, communication, or appearance that signal a difficult day.",
@@ -101,8 +98,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Support",
-          "allowedVerbs": ["Support", "Help", "Assist"]
+          "presetAnswer": "Support"
         },
         "object": {
           "question": "Detail the actions and approach you prefer for support.",
@@ -130,8 +126,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "List the symptoms affecting your work readiness.",
@@ -159,8 +154,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "Describe any parental or caring responsibilities you have.",
@@ -188,8 +182,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Support",
-          "allowedVerbs": ["Support", "Help"]
+          "presetAnswer": "Support"
         },
         "object": {
           "question": "Detail the support or arrangements you require.",
@@ -217,8 +210,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Support",
-          "allowedVerbs": ["Support", "Help"]
+          "presetAnswer": "Support"
         },
         "object": {
           "question": "Describe any necessary accommodations for your religious practices (e.g., prayer space, holidays).",
@@ -246,8 +238,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "Provide any extra details, such as dietary requirements or other relevant religious information.",
@@ -275,8 +266,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "Detail the impact and any related conditions affecting your work.",
@@ -304,8 +294,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "List the challenges and how they impact your job performance.",
@@ -321,7 +310,7 @@
     },
     {
       "id": "q12",
-      "category": "colleague_Sharing",
+      "category": "Colleague_Sharing",
       "mainQuestion": "Share the information about your work needs that would be helpful for your colleagues.",
       "steps": {
         "subject": {
@@ -333,8 +322,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Share",
-          "allowedVerbs": ["Share"]
+          "presetAnswer": "Share"
         },
         "object": {
           "question": "Detail what your colleagues should know and how you prefer this information to be shared.",
@@ -362,8 +350,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Support",
-          "allowedVerbs": ["Support", "Help", "Assist"]
+          "presetAnswer": "Support"
         },
         "object": {
           "question": "Describe how we can better support and communicate with you.",
@@ -391,8 +378,7 @@
         "verb": {
           "question": "Select the action verb for your statement.",
           "preset": true,
-          "presetAnswer": "Introduce",
-          "allowedVerbs": ["Introduce", "Share"]
+          "presetAnswer": "Introduce"
         },
         "object": {
           "question": "Provide a brief personal and professional introduction including key details.",
diff --git a/src/features/auth/components/LoginPage.tsx b/src/features/auth/components/LoginPage.tsx
index b13b8fe..7822c4f 100644
--- a/src/features/auth/components/LoginPage.tsx
+++ b/src/features/auth/components/LoginPage.tsx
@@ -24,6 +24,7 @@ const LoginPage: React.FC<LoginPageProps> = ({ onSubmit }) => {
   const { setData } = useEntries();
   const [name, setName] = useState('');
   const [managerName, setManagerName] = useState('');
+  const [managerEmail, setManagerEmail] = useState('');
   const [step, setStep] = useState<'authenticate' | 'profile'>('authenticate');
   const [verifying, setVerifying] = useState(false);
   const [isPrivacyModalOpen, setIsPrivacyModalOpen] = useState(false);
@@ -35,40 +36,46 @@ const LoginPage: React.FC<LoginPageProps> = ({ onSubmit }) => {
       setVerifying(true);
       const result = await handleMagicLinkVerification();
       setVerifying(false);
-      
+
       // If verification successful and we have user data, move to profile step
-      if (result.success && result.user) {
+      if (result.success && 'user' in result && result.user) {
         setStep('profile');
       }
     };
 
     // Initial verification
     verifyToken();
-    
+
     // Listen for popstate events (back/forward navigation)
     const handlePopState = () => {
       verifyToken();
     };
-    
+
     // Listen for custom magicLinkVerified events
     const handleVerified = (e: CustomEvent) => {
       console.log('Magic link verified event received:', e.detail);
       setStep('profile');
     };
-    
+
     // Listen for verify magic link events from mock service
     const handleVerifyEvent = () => {
       console.log('Verify magic link event received');
       verifyToken();
     };
-    
+
     window.addEventListener('popstate', handlePopState);
-    window.addEventListener('magicLinkVerified', handleVerified as EventListener);
+    window.addEventListener(
+      'magicLinkVerified',
+      handleVerified as EventListener
+    );
     window.addEventListener('verifyMagicLink', handleVerifyEvent);
-    
+
     return () => {
       window.removeEventListener('popstate', handlePopState);
-      window.removeEventListener('magicLinkVerified', handleVerified as EventListener);
+      window.removeEventListener(
+        'magicLinkVerified',
+        handleVerified as EventListener
+      );
       window.removeEventListener('verifyMagicLink', handleVerifyEvent);
     };
   }, []);
@@ -82,27 +89,30 @@ const LoginPage: React.FC<LoginPageProps> = ({ onSubmit }) => {
 
   const handleProfileSubmit = (e: React.FormEvent) => {
     e.preventDefault();
-    
+
     // Save user profile data
     if (name.trim()) {
+      // Set user's name
       setData({ type: 'SET_USERNAME', payload: name.trim() });
-      
+
+      // If manager name is provided, save it
       if (managerName.trim()) {
         setData({ type: 'SET_MANAGER_NAME', payload: managerName.trim() });
       }
-      
-      // If user provided email in auth, use it for manager email
+
+      // If manager email is provided, save it
+      if (managerEmail.trim()) {
+        setData({ type: 'SET_MANAGER_EMAIL', payload: managerEmail.trim() });
+      }
+
+      // Store user's email from auth in userEmail field
       if (state.user?.email) {
-        setData({ type: 'SET_MANAGER_EMAIL', payload: state.user.email });
+        setData({ type: 'SET_USER_EMAIL', payload: state.user.email });
       }
-      
+
       // Call original onSubmit if provided (for backward compatibility)
       if (onSubmit) {
-        onSubmit(
-          name.trim(), 
-          managerName.trim(), 
-          state.user?.email || ''
-        );
+        onSubmit(name.trim(), managerName.trim(), managerEmail.trim());
       }
     }
   };
@@ -110,17 +120,17 @@ const LoginPage: React.FC<LoginPageProps> = ({ onSubmit }) => {
   // Show loader while verifying token
   if (verifying) {
     return (
-      <div className='min-h-screen flex items-center justify-center p-4 bg-gray-50'>
+      <div className='flex items-center justify-center p-4 pt-4 mt-0 bg-gray-50'>
         <div className='flex flex-col items-center'>
-          <Loader2 className="h-12 w-12 animate-spin text-brand-pink mb-4" />
-          <h2 className="text-xl font-medium">Verifying your login...</h2>
+          <Loader2 className='h-12 w-12 animate-spin text-brand-pink mb-4' />
+          <h2 className='text-xl font-medium'>Verifying your login...</h2>
         </div>
       </div>
     );
   }
 
   return (
-    <div className='min-h-screen flex items-center justify-center p-4 bg-gray-50'>
+    <div className='flex items-center justify-center p-4 pt-4 mt-0 bg-gray-50'>
       <div className='bg-white shadow-lg rounded-lg p-8 max-w-md w-full'>
         {isPrivacyModalOpen && (
           <PrivacyModal onClose={() => setIsPrivacyModalOpen(false)} />
@@ -130,72 +140,125 @@ const LoginPage: React.FC<LoginPageProps> = ({ onSubmit }) => {
         )}
         {step === 'authenticate' ? (
           <>
-            <h1 className='text-3xl font-bold mb-6 text-center'>Welcome to Beacons</h1>
+            <h1 className='text-3xl font-bold mb-6 text-center'>
+              Welcome to Beacons
+            </h1>
             <p className='mb-6 text-center text-gray-700'>
               Sign in with your email to access the application.
             </p>
-            <div className="mb-4 p-3 bg-gray-50 rounded-md border border-gray-200 text-sm text-gray-600">
-              <p className="mb-2">
-                By signing in, you agree to our <button onClick={() => setIsPrivacyModalOpen(true)} className="text-brand-pink underline">Privacy Policy</button> and <button onClick={() => setIsTermsModalOpen(true)} className="text-brand-pink underline">Terms of Use</button>.
+            <MagicLinkForm callbackURL='/main' />
+            <div className='mt-4 mb-4 p-3 bg-gray-50 rounded-md border border-gray-200 text-sm text-gray-600'>
+              <p className='mb-2'>
+                By signing in, you agree to our{' '}
+                <button
+                  onClick={() => setIsPrivacyModalOpen(true)}
+                  className='text-brand-pink underline'
+                >
+                  Privacy Policy
+                </button>{' '}
+                and{' '}
+                <button
+                  onClick={() => setIsTermsModalOpen(true)}
+                  className='text-brand-pink underline'
+                >
+                  Terms of Use
+                </button>
+                .
               </p>
               <p>
-                We collect and process your data to provide the Beacons service. You control what information is shared with your employer.
+                We collect and process your data to provide the Beacons service.
+                You control what information is shared with your employer.
               </p>
             </div>
-            <MagicLinkForm callbackURL="/main" />
           </>
         ) : (
           <>
-            <h1 className='text-3xl font-bold mb-6 text-center'>Complete Your Profile</h1>
-            <p className='mb-6 text-center text-gray-700'>
-              Please enter your name and, optionally, your line manager's name to continue.
-            </p>
-            <form onSubmit={handleProfileSubmit} className='space-y-4'>
-              <div>
-                <label htmlFor="name" className="block text-sm font-medium text-gray-700 mb-1">
-                  Your Name
-                </label>
-                <Input
-                  id="name"
-                  placeholder='Enter your name'
-                  value={name}
-                  onChange={(e) => setName(e.target.value)}
-                  className='w-full'
-                  required
-                />
-              </div>
-              
-              <div>
-                <label htmlFor="managerName" className="block text-sm font-medium text-gray-700 mb-1">
-                  Line Manager's Name (optional)
-                </label>
-                <Input
-                  id="managerName"
-                  placeholder="Enter your manager's name"
-                  value={managerName}
-                  onChange={(e) => setManagerName(e.target.value)}
-                  className='w-full'
-                />
-              </div>
+            <h1 className='text-3xl font-bold mb-6 text-center'>
+              Complete Your Profile
+            </h1>
 
-              {state.user?.email && (
-                <div className="mt-2">
-                  <div className="text-sm font-medium text-gray-700 mb-1">
-                    Email Address
-                  </div>
-                  <div className="px-3 py-2 bg-gray-100 rounded text-gray-800 break-all">
-                    {state.user.email}
+            <form onSubmit={handleProfileSubmit}>
+              {/* User Information Section */}
+              <div className='mb-6 p-4 bg-pink-50 rounded-lg border border-pink-100'>
+                <h3 className='text-md font-semibold text-brand-pink mb-3 border-b pb-2 border-pink-200'>
+                  Your Information
+                </h3>
+
+                <div className='mb-4'>
+                  <label
+                    htmlFor='name'
+                    className='block text-sm font-medium text-gray-700 mb-1'
+                  >
+                    Your Name <span className='text-red-500'>*</span>
+                  </label>
+                  <Input
+                    id='name'
+                    placeholder='Enter your name'
+                    value={name}
+                    onChange={(e) => setName(e.target.value)}
+                    className='w-full'
+                    required
+                  />
+                </div>
+
+                {state.user?.email && (
+                  <div>
+                    <label className='block text-sm font-medium text-gray-700 mb-1'>
+                      Your Email Address
+                    </label>
+                    <div className='px-3 py-2 bg-white border border-gray-200 rounded text-gray-800 break-all'>
+                      {state.user.email}
+                    </div>
+                    <p className='text-xs text-gray-500 mt-1'>
+                      You signed in with this email address
+                    </p>
                   </div>
-                  <p className="text-xs text-gray-500 mt-1">
-                    You signed in with this email address
-                  </p>
+                )}
+              </div>
+
+              {/* Manager Information Section */}
+              <div className='mb-6 p-4 bg-blue-50 rounded-lg border border-blue-100'>
+                <h3 className='text-md font-semibold text-blue-600 mb-3 border-b pb-2 border-blue-200'>
+                  Manager Information (Optional)
+                </h3>
+
+                <div className='mb-4'>
+                  <label
+                    htmlFor='managerName'
+                    className='block text-sm font-medium text-gray-700 mb-1'
+                  >
+                    Line Manager's Name
+                  </label>
+                  <Input
+                    id='managerName'
+                    placeholder="Enter your manager's name"
+                    value={managerName}
+                    onChange={(e) => setManagerName(e.target.value)}
+                    className='w-full'
+                  />
                 </div>
-              )}
+
+                <div>
+                  <label
+                    htmlFor='managerEmail'
+                    className='block text-sm font-medium text-gray-700 mb-1'
+                  >
+                    Line Manager's Email
+                  </label>
+                  <Input
+                    id='managerEmail'
+                    placeholder="Enter your manager's email"
+                    value={managerEmail}
+                    onChange={(e) => setManagerEmail(e.target.value)}
+                    className='w-full'
+                  />
+                </div>
+              </div>
 
               <Button
                 type='submit'
                 variant='pink'
-                className='mx-auto shadow-sm w-full mt-6'
+                className='mx-auto shadow-sm w-full'
                 disabled={!name.trim()}
               >
                 Continue
diff --git a/src/features/email/api/emailApi.ts b/src/features/email/api/emailApi.ts
index efb2575..bbf84a4 100644
--- a/src/features/email/api/emailApi.ts
+++ b/src/features/email/api/emailApi.ts
@@ -50,4 +50,48 @@ export async function sendEmail(email: Email) {
     console.error("Error sending email:", error);
     throw error;
   }
+}
+
+// Mock implementation of sharing statements
+const mockShareStatements = async (recipientEmail: string) => {
+  console.log('MOCK: Sharing statements with:', recipientEmail);
+  
+  // Simulate network delay
+  await new Promise(resolve => setTimeout(resolve, 800));
+  
+  // Return mock success response
+  return {
+    success: true,
+    message: 'Statements shared successfully (mock)',
+    id: `mock-share-${Date.now()}`
+  };
+};
+
+// Share statements via backend API or mock
+export async function shareStatements(recipientEmail: string) {
+  // Use mock implementation if enabled
+  if (shouldUseMock()) {
+    return mockShareStatements(recipientEmail);
+  }
+  
+  // Real implementation
+  try {
+    const response = await fetch('/api/email/share-statements', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ recipientEmail }),
+    });
+    
+    if (!response.ok) {
+      const errorData = await response.json();
+      throw new Error(errorData.message || 'Failed to share statements');
+    }
+    
+    return await response.json();
+  } catch (error) {
+    console.error("Error sharing statements:", error);
+    throw error;
+  }
 }
\ No newline at end of file
diff --git a/src/features/email/api/gratitudeApi.ts b/src/features/email/api/gratitudeApi.ts
index 7ed6e33..c3dad31 100644
--- a/src/features/email/api/gratitudeApi.ts
+++ b/src/features/email/api/gratitudeApi.ts
@@ -45,9 +45,11 @@ const mockMarkGratitudeSent = async (statementId: string, actionId: string, mess
     byDate: '',
     action: `Mock action for statement ${statementId}`,
     completed: true,
-    gratitudeSent: true,
-    gratitudeMessage: message,
-    gratitudeSentDate: new Date().toISOString()
+    gratitude: {
+      sent: true,
+      message: message,
+      sentDate: new Date().toISOString()
+    }
   };
 };
 
diff --git a/src/features/statements/components/ActionForm.tsx b/src/features/statements/components/ActionForm.tsx
index 3740e02..caeb7b9 100644
--- a/src/features/statements/components/ActionForm.tsx
+++ b/src/features/statements/components/ActionForm.tsx
@@ -30,7 +30,8 @@ const ActionForm: React.FC<ActionFormProps> = ({
 
   return (
     <div className='flex flex-col space-y-1'>
-      <div className='flex items-center cursor-pointer hover:bg-gray-100 gap-1 border border-dashed border-gray-300 p-1 rounded'>
+      {/* Desktop layout (xs and up) - all in one row */}
+      <div className='hidden xs:flex items-center cursor-pointer hover:bg-gray-100 gap-1 border border-dashed border-gray-300 p-1 rounded'>
         <Input
           placeholder='Action text'
           value={text}
@@ -65,8 +66,61 @@ const ActionForm: React.FC<ActionFormProps> = ({
           <X size={16} />
         </Button>
       </div>
+
+      {/* Mobile layout (below xs) - three rows */}
+      <div className='xs:hidden flex flex-col space-y-2 cursor-pointer hover:bg-gray-100 border border-dashed border-gray-300 p-2 rounded'>
+        {/* Row 1: Action text */}
+        <div className='w-full'>
+          <Input
+            placeholder='Action text'
+            value={text}
+            onChange={(e) => setText(e.target.value)}
+            className='w-full'
+          />
+        </div>
+
+        {/* Row 2: Date field with label on same row */}
+        <div className='w-full pt-0 flex items-center justify-end gap-2'>
+          <label className='text-sm text-right text-gray-700 min-w-[110px]'>
+            Due date
+          </label>
+          <Input
+            type='date'
+            value={dueDate}
+            onChange={(e) => setDueDate(e.target.value)}
+            className='flex-1'
+          />
+        </div>
+
+        {/* Row 3: Buttons */}
+        <div className='flex justify-start space-x-2 pt-2 '>
+          <Button
+            variant='outline'
+            size='sm'
+            onClick={onCancel}
+            className='border-gray-300'
+          >
+            <X size={16} className='mr-1' />
+            <span>Cancel</span>
+          </Button>
+          <Button
+            variant='default'
+            size='sm'
+            onClick={handleSave}
+            disabled={isSaveDisabled}
+            className={`bg-green-600 hover:bg-green-700 text-white ${
+              isSaveDisabled ? 'opacity-50' : ''
+            }`}
+          >
+            <Save size={16} className='mr-1' />
+            <span>Save</span>
+          </Button>
+        </div>
+      </div>
+
+      {/* Due date helper text - only show on desktop view */}
       {!dueDate.trim() && (
-        <div className='text-sm text-gray-500 ml-2 text-right'>
+        <div className='text-sm text-gray-500 ml-2 text-right hidden xs:block'>
           No due date selected (optional)
         </div>
       )}
diff --git a/src/features/statements/components/ActionLine.tsx b/src/features/statements/components/ActionLine.tsx
index a57c5b3..9ab56db 100644
--- a/src/features/statements/components/ActionLine.tsx
+++ b/src/features/statements/components/ActionLine.tsx
@@ -21,10 +21,10 @@ import { CheckCircle2, XCircle } from 'lucide-react';
 import GratitudeModal from '../../../components/modals/GratitudeModal';
 import { markGratitudeSent } from '../../../features/email/api/gratitudeApi';
 import { useEntries } from '../hooks/useEntries';
-import { 
-  Tooltip, 
-  TooltipTrigger, 
-  TooltipContent 
+import {
+  Tooltip,
+  TooltipTrigger,
+  TooltipContent,
 } from '../../../components/ui/better-tooltip';
 
 export interface ActionLineProps {
@@ -61,7 +61,7 @@ const ActionLine: React.FC<ActionLineProps> = ({
     isOpen: boolean;
     action: Action | null;
   }>({ isOpen: false, action: null });
-  
+
   // Get entries data to check for manager email
   const { data } = useEntries();
   const hasManagerEmail = data.managerEmail && data.managerEmail.trim() !== '';
@@ -114,7 +114,7 @@ const ActionLine: React.FC<ActionLineProps> = ({
   };
 
   return (
-    <div className='ml-1 pl-3 border-gray-200 space-y-2 mt-2'>
+    <div className='ml-0 pl-0 md:pl-2 border-gray-200 space-y-2 mt-2'>
       {actions.map((action) => {
         const isEditing = editingActionId === action.id;
         if (!isEditing) {
@@ -128,58 +128,91 @@ const ActionLine: React.FC<ActionLineProps> = ({
           return (
             <div
               key={action.id}
-              className={`flex items-center justify-between p-2 rounded border shadow-sm transition-colors bg-gray-50 hover:bg-gray-100 ${
+              className={`flex items-center justify-between p-2 rounded border shadow-sm transition-colors bg-gray-50 hover:bg-gray-100 relative ${
                 action.completed ? 'border-green-500' : 'border-gray-200'
               }`}
             >
-              {/* Text is placed on the left, taking up all remaining space with "flex-1". */}
-              <span className='flex-1'>{action.action}</span>
+              {/* Resolved badge - positioned in top right corner similar to archived badge */}
+              {action.completed && (
+                <span className='absolute -top-2 -right-2 bg-green-100 text-green-600 text-xs gap-1 px-2 py-0.5 rounded-full flex'>
+                  <CheckCircle2 size={14} />
+                  Resolved
+                </span>
+              )}
+              {/* Desktop layout (larger than xs breakpoint) */}
+              <div className='hidden xs:flex xs:items-center xs:justify-between w-full'>
+                <span className='flex-1'>{action.action}</span>
 
-              {/* Right side holds icons and dropdown menu. */}
-              <div className='flex items-center space-x-4'>
-                {/* Show resolved icon if action.completed is true. */}
-                {action.completed && (
-                  <CheckCircle2 size={18} className='text-green-600' />
-                )}
+                {/* Right side holds icons and dropdown menu. */}
+                <div className='flex items-center space-x-4 ml-2 flex-shrink-0'>
+                  {/* Show gratitude sent icon with tooltip */}
+                  {action.gratitude?.sent && (
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <div className='relative inline-flex items-center cursor-pointer'>
+                          <MessageCircleHeart
+                            size={18}
+                            className='text-pink-500'
+                          />
+                          {/* Small dot indicator */}
+                          <span className='absolute top-0 right-0 block w-2 h-2 bg-pink-500 border border-white rounded-full'></span>
+                        </div>
+                      </TooltipTrigger>
+                      <TooltipContent className='p-2 bg-black text-white rounded max-w-xs'>
+                        <div className='text-center'>
+                          <p className='font-semibold mb-1'>Gratitude Sent</p>
+                          {action.gratitude?.sentDate && (
+                            <p className='text-xs opacity-80'>
+                              {new Date(
+                                action.gratitude.sentDate
+                              ).toLocaleDateString()}
+                            </p>
+                          )}
+                          {action.gratitude?.message && (
+                            <p className='text-xs italic mt-1 max-w-xs break-words'>
+                              "{action.gratitude.message}"
+                            </p>
+                          )}
+                        </div>
+                      </TooltipContent>
+                    </Tooltip>
+                  )}
 
-                {/* Show gratitude sent icon with tooltip */}
-                {action.gratitudeSent && (
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <div className='relative inline-flex items-center cursor-pointer'>
-                        <MessageCircleHeart
-                          size={18}
-                          className='text-pink-500'
-                        />
-                        {/* Small dot indicator */}
-                        <span className="absolute top-0 right-0 block w-2 h-2 bg-pink-500 border border-white rounded-full"></span>
-                      </div>
-                    </TooltipTrigger>
-                    <TooltipContent className='p-2 bg-black text-white rounded max-w-xs'>
-                      <div className="text-center">
-                        <p className="font-semibold mb-1">Gratitude Sent</p>
-                        {action.gratitudeSentDate && (
-                          <p className="text-xs opacity-80">
-                            {new Date(action.gratitudeSentDate).toLocaleDateString()}
-                          </p>
-                        )}
-                        {action.gratitudeMessage && (
-                          <p className="text-xs italic mt-1 max-w-xs break-words">
-                            "{action.gratitudeMessage}"
-                          </p>
-                        )}
-                      </div>
-                    </TooltipContent>
-                  </Tooltip>
-                )}
+                  {/* Show due date if present. */}
+                  {dueDateText && (
+                    <span className='text-sm text-gray-500 whitespace-nowrap'>
+                      Due: {dueDateText}
+                    </span>
+                  )}
+                </div>
+              </div>
+
+              {/* Mobile layout (smaller than xs breakpoint) - two rows if due date exists */}
+              <div className='xs:hidden w-full'>
+                {/* First row: action text */}
+                <div className='flex items-center'>
+                  <span className='flex-1 mr-2'>{action.action}</span>
+
+                  {/* Status icons */}
+                  <div className='flex items-center space-x-1 flex-shrink-0'>
+                    {action.gratitude?.sent && (
+                      <MessageCircleHeart size={18} className='text-pink-500' />
+                    )}
+                  </div>
+                </div>
 
-                {/* Show due date if present. */}
+                {/* Second row: due date if exists */}
                 {dueDateText && (
-                  <span className='text-sm text-gray-500'>
-                    Due: {dueDateText}
-                  </span>
+                  <div className='flex justify-end mt-1 pt-1 border-t border-gray-100'>
+                    <span className='text-sm text-gray-500'>
+                      Due: {dueDateText}
+                    </span>
+                  </div>
                 )}
+              </div>
 
+              {/* Dropdown menu for both layouts - aligned to top */}
+              <div className='ml-2 flex-shrink-0 self-start mt-1'>
                 <DropdownMenu>
                   <DropdownMenuTrigger asChild>
                     <button onClick={(e) => e.stopPropagation()}>
@@ -217,33 +250,24 @@ const ActionLine: React.FC<ActionLineProps> = ({
                     </DropdownMenuItem>
 
                     {/* Only hide gratitude option for actions that already had gratitude sent */}
-                    {!action.gratitudeSent && (
+                    {!action.gratitude?.sent && (
                       <>
                         <DropdownMenuSeparator />
-                        {/* Determine if manager email is set */}
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <div className="w-full">
-                              <DropdownMenuItem
-                                onClick={() => {
-                                  if (hasManagerEmail) {
-                                    setGratitudeModal({ isOpen: true, action });
-                                  }
-                                }}
-                                className={`${hasManagerEmail ? 'text-pink-600' : 'text-pink-300 cursor-not-allowed'}`}
-                                disabled={!hasManagerEmail}
-                              >
-                                <Heart className='mr-2 h-4 w-4' />
-                                Send gratitude
-                              </DropdownMenuItem>
-                            </div>
-                          </TooltipTrigger>
-                          {!hasManagerEmail && (
-                            <TooltipContent className='p-2 bg-black text-white rounded'>
-                              Manager's email is required to send gratitude
-                            </TooltipContent>
-                          )}
-                        </Tooltip>
+                        <div className="w-full">
+                          <DropdownMenuItem
+                            onClick={() => {
+                              if (hasManagerEmail) {
+                                setGratitudeModal({ isOpen: true, action });
+                              }
+                            }}
+                            className={hasManagerEmail ? "text-pink-600" : "text-pink-300 cursor-not-allowed"}
+                            disabled={!hasManagerEmail}
+                            title={!hasManagerEmail ? "Manager's email is required to send gratitude" : ""}
+                          >
+                            <Heart className='mr-2 h-4 w-4' />
+                            Send gratitude
+                          </DropdownMenuItem>
+                        </div>
                       </>
                     )}
                   </DropdownMenuContent>
diff --git a/src/features/statements/components/ActionsCounter.tsx b/src/features/statements/components/ActionsCounter.tsx
index e8d0f0c..b91e2d3 100644
--- a/src/features/statements/components/ActionsCounter.tsx
+++ b/src/features/statements/components/ActionsCounter.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import React, { useRef, useState, useEffect } from 'react';
-import { ChevronDown, ChevronUp, List } from 'lucide-react';
+import React, { useRef } from 'react';
+import { ChevronDown, ChevronUp } from 'lucide-react';
 
 interface ActionsCounterProps {
   count: number;
@@ -13,37 +13,35 @@ const ActionsCounter: React.FC<ActionsCounterProps> = ({
   expanded = false,
 }) => {
   const containerRef = useRef<HTMLSpanElement>(null);
-  const [isOverflowing, setIsOverflowing] = useState(false);
 
-  // We force a max width so the text might actually overflow.
+  // Tab-like styling similar to category tabs
   const baseClasses =
-    'inline-flex items-center rounded-full px-3 py-1 text-sm transition-colors cursor-pointer whitespace-nowrap max-w-[150px] overflow-hidden';
+    'inline-flex items-center px-3 py-1 text-sm transition-colors cursor-pointer whitespace-nowrap';
+  
+  // Determine border radius and border styling based on expanded state
+  const borderStyles = expanded 
+    ? 'rounded-t-lg border-t border-l border-r' 
+    : 'rounded-lg border';
+    
   const backgroundClasses =
-    count > 0 ? 'bg-brand-pink text-white' : 'bg-gray-100 text-gray-600';
+    count > 0
+      ? `bg-brand-pink text-white ${borderStyles} border-brand-pink`
+      : `bg-slate-100 text-gray-600 ${borderStyles} border-slate-300`;
 
   // Determine the display text.
   let displayText = '';
   if (count === 0) {
-    displayText = 'no actions';
+    displayText = 'No actions';
   } else if (count === 1) {
     displayText = '1 action';
   } else {
     displayText = `${count} actions`;
   }
 
-  useEffect(() => {
-    if (!containerRef.current) return;
-    const el = containerRef.current;
-    // Compare the actual content width vs. the visible width.
-    setIsOverflowing(el.scrollWidth > el.clientWidth);
-  }, [count, displayText]);
-
-  // If overflowing, show an icon; otherwise show the text.
-  const content = isOverflowing ? <List size={16} /> : displayText;
-
+  // Always show text for tab-like design
   return (
     <span ref={containerRef} className={`${baseClasses} ${backgroundClasses}`}>
-      {content}
+      <span className='font-medium'>{displayText}</span>
       <span className='ml-1'>
         {expanded ? <ChevronUp size={16} /> : <ChevronDown size={16} />}
       </span>
diff --git a/src/features/statements/components/QuestionCard.tsx b/src/features/statements/components/QuestionCard.tsx
index 1099f6f..95439f2 100644
--- a/src/features/statements/components/QuestionCard.tsx
+++ b/src/features/statements/components/QuestionCard.tsx
@@ -2,9 +2,13 @@
 
 import React from 'react';
 import type { SetQuestion } from '../../../types/entries';
-import { HelpCircle, ChevronRight, BellOff, Bell } from 'lucide-react';
+import { HelpCircle, BellOff, Bell } from 'lucide-react';
 import { cn } from '../../../lib/utils';
-import { Tooltip, TooltipTrigger, TooltipContent } from '../../../components/ui/better-tooltip';
+import {
+  Tooltip,
+  TooltipTrigger,
+  TooltipContent,
+} from '../../../components/ui/better-tooltip';
 
 export interface QuestionCardProps {
   presetQuestion: SetQuestion;
@@ -24,10 +28,12 @@ const QuestionCard: React.FC<QuestionCardProps> = ({
   };
 
   return (
-    <div className='relative'>
+    <div className='relative question-card '>
       {/* Question Card */}
-      <div 
-        onClick={presetQuestion.isSnoozed ? () => {} : () => onSelect(presetQuestion)} 
+      <div
+        onClick={
+          presetQuestion.isSnoozed ? () => {} : () => onSelect(presetQuestion)
+        }
         className={cn(
           presetQuestion.isSnoozed ? 'cursor-default' : 'cursor-pointer',
           presetQuestion.isSnoozed && 'opacity-60'
@@ -35,9 +41,9 @@ const QuestionCard: React.FC<QuestionCardProps> = ({
       >
         <div
           className={cn(
-            'bg-white rounded-md p-3 shadow-sm flex items-center',
+            'bg-white rounded-md p-1 md:p-3 shadow-sm flex items-center',
             !presetQuestion.isSnoozed && 'hover:bg-gray-100',
-            'transition-colors border-2 border-dotted',
+            'transition-colors border md:border-2 border-dashed',
             presetQuestion.isSnoozed ? 'border-blue-300' : 'border-brand-pink'
           )}
         >
@@ -45,7 +51,7 @@ const QuestionCard: React.FC<QuestionCardProps> = ({
           {!presetQuestion.isSnoozed && (
             <Tooltip>
               <TooltipTrigger asChild>
-                <span className="inline-flex items-center justify-center mr-2 text-brand-pink bg-pink-50 p-1 rounded-full">
+                <span className='inline-flex items-center justify-center mr-1 md:mr-2 text-brand-pink bg-pink-50 p-1 rounded-full'>
                   <HelpCircle size={16} />
                 </span>
               </TooltipTrigger>
@@ -54,46 +60,45 @@ const QuestionCard: React.FC<QuestionCardProps> = ({
               </TooltipContent>
             </Tooltip>
           )}
-          
+
           {/* Main question text (truncated if too long) */}
-          <span className='flex-1 truncate text-lg'>
+          <span className='flex-1 truncate text-base md:text-lg'>
             {presetQuestion.mainQuestion}
           </span>
-          
+
           {/* Snooze/Unsnooze button */}
-          <div className="relative">
+          <div className='relative'>
             <Tooltip>
               <TooltipTrigger asChild>
-                <button 
+                <button
                   onClick={handleSnoozeClick}
                   className={cn(
-                    "mr-2 p-1.5 rounded-full transition-colors flex items-center justify-center",
-                    "border border-gray-200 shadow-sm",
-                    presetQuestion.isSnoozed 
-                      ? "hover:bg-blue-100 bg-blue-50" 
-                      : "hover:bg-gray-100"
+                    'mr-1 md:mr-2 p-1.5 rounded-full transition-colors flex items-center justify-center',
+                    'border border-gray-200 shadow-sm',
+                    presetQuestion.isSnoozed
+                      ? 'hover:bg-blue-100 bg-blue-50'
+                      : 'hover:bg-gray-100'
                   )}
-                  aria-label={presetQuestion.isSnoozed ? "Unsnooze question" : "Snooze question"}
+                  aria-label={
+                    presetQuestion.isSnoozed
+                      ? 'Unsnooze question'
+                      : 'Snooze question'
+                  }
                 >
                   {presetQuestion.isSnoozed ? (
-                    <Bell size={16} className="text-blue-600" />
+                    <Bell size={16} className='text-blue-600' />
                   ) : (
-                    <BellOff size={16} className="text-gray-600" />
+                    <BellOff size={16} className='text-gray-600' />
                   )}
                 </button>
               </TooltipTrigger>
               <TooltipContent className='p-2 bg-black text-white rounded'>
-                {presetQuestion.isSnoozed ? 'Unsnooze question' : 'Snooze question'}
+                {presetQuestion.isSnoozed
+                  ? 'Unsnooze question'
+                  : 'Snooze question'}
               </TooltipContent>
             </Tooltip>
           </div>
-          
-          {/* Chevron icon to indicate clickability - only for non-snoozed questions */}
-          {!presetQuestion.isSnoozed && (
-            <span className='inline-flex items-center justify-center p-1 rounded-full bg-gray-100 text-gray-500'>
-              <ChevronRight size={16} />
-            </span>
-          )}
         </div>
       </div>
     </div>
diff --git a/src/features/statements/components/StatementItem.tsx b/src/features/statements/components/StatementItem.tsx
index ffe9c48..7a7f312 100644
--- a/src/features/statements/components/StatementItem.tsx
+++ b/src/features/statements/components/StatementItem.tsx
@@ -5,14 +5,13 @@ import {
   Trash2,
   Edit2,
   Save,
-  MoreVertical,
   RotateCcw,
-  CheckCircle2,
   Archive,
   ArchiveRestore,
   MailPlus,
   MailX,
   PenOff,
+  Settings,
 } from 'lucide-react';
 import type { Entry } from '@/types/entries';
 import {
@@ -55,7 +54,7 @@ export interface StatementItemProps {
     newAction: { text: string; dueDate?: string }
   ) => void;
   onReset?: (statementId: string) => void;
-  onToggleResolved?: (statementId: string) => void;
+  onToggleArchived?: (statementId: string) => void;
   onToggleActionResolved?: (actionId: string) => void;
   originalCategory?: string; // Add prop for original category from parent
 }
@@ -107,7 +106,7 @@ const StatementItem: React.FC<StatementItemProps> = ({
   onDeleteAction = () => {},
   onAddAction = () => {},
   onReset,
-  onToggleResolved = () => {},
+  onToggleArchived = () => {},
   onToggleActionResolved = () => {},
   originalCategory: externalOriginalCategory, // Get original category from parent
 }) => {
@@ -663,21 +662,22 @@ const StatementItem: React.FC<StatementItemProps> = ({
     <div
       ref={itemRef}
       id={`statement-${statement.id}`}
-      className={`border rounded-md p-3 space-y-2 relative ${
-        statement.isResolved
+      className={`border rounded-md p-1 md:p-3 space-y-2 relative ${
+        statement.isArchived
           ? 'bg-gray-100 border-gray-300 opacity-80'
           : 'bg-white border-gray-200 shadow-sm'
       }`}
     >
       {/* Archived badge - positioned in top right corner */}
-      {statement.isResolved && (
+      {statement.isArchived && (
         <span className='absolute -top-2 -right-2 bg-gray-200 text-gray-600 text-xs gap-1 px-2 py-0.5 rounded-full flex'>
           <Archive size={14} />
           Archived
         </span>
       )}
 
-      <div className='flex items-center justify-between'>
+      {/* Desktop layout (xs breakpoint and above) */}
+      <div className='hidden xs:flex xs:items-center xs:justify-between'>
         <div className='flex items-center space-x-2'>
           {/* Privacy status icon */}
           <Tooltip>
@@ -685,7 +685,7 @@ const StatementItem: React.FC<StatementItemProps> = ({
               <span
                 className={`inline-flex items-center justify-center ${
                   statement.isPublic ? 'text-green-500' : 'text-red-500'
-                } ${statement.isResolved ? 'opacity-70' : ''}`}
+                } ${statement.isArchived ? 'opacity-70' : ''}`}
               >
                 {statement.isPublic ? (
                   <MailPlus size={16} />
@@ -703,7 +703,7 @@ const StatementItem: React.FC<StatementItemProps> = ({
 
           {/* Statement text with archived styling if needed */}
           <div className='flex flex-col'>
-            <span className={statement.isResolved ? 'text-gray-500' : ''}>
+            <span className={statement.isArchived ? 'text-gray-500' : ''}>
               {`${statement.atoms.subject} ${getVerbName(
                 statement.atoms.verb
               )} ${statement.atoms.object}`}
@@ -711,31 +711,113 @@ const StatementItem: React.FC<StatementItemProps> = ({
           </div>
         </div>
         <div className='flex items-center space-x-4'>
-          {statement.isResolved && (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <span className='inline-flex items-center justify-center text-green-600'>
-                  <CheckCircle2 size={18} />
-                </span>
-              </TooltipTrigger>
-              <TooltipContent className='p-2 bg-black text-white rounded'>
-                This statement is resolved.
-              </TooltipContent>
-            </Tooltip>
-          )}
+          {/* Menu button */}
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <button
+                onClick={(e) => e.stopPropagation()}
+                className='p-1.5 rounded-full hover:bg-gray-200 transition-colors'
+              >
+                <Settings size={18} className='text-gray-600' />
+              </button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align='end'>
+              <DropdownMenuItem onClick={() => onEditClick(statement.id)}>
+                <Edit2 className='mr-2 h-4 w-4' />
+                Edit
+              </DropdownMenuItem>
+              <DropdownMenuItem
+                onClick={() => onDelete(statement.id)}
+                className='text-red-600'
+              >
+                <Trash2 className='mr-2 h-4 w-4' />
+                Delete
+              </DropdownMenuItem>
+              <DropdownMenuItem onClick={() => onToggleArchived(statement.id)}>
+                {statement.isArchived ? (
+                  <>
+                    <ArchiveRestore className='mr-2 h-4 w-4  text-gray-600' />
+                    Unarchive
+                  </>
+                ) : (
+                  <>
+                    <Archive className='mr-2 h-4 w-4 text-gray-600' />
+                    Archive
+                  </>
+                )}
+              </DropdownMenuItem>
+
+              {onReset && (
+                <DropdownMenuItem onClick={() => onReset(statement.id)}>
+                  <RotateCcw className='mr-2 h-4 w-4' />
+                  Reset
+                </DropdownMenuItem>
+              )}
+            </DropdownMenuContent>
+          </DropdownMenu>
+
+          {/* Actions counter - now the rightmost element */}
           <div
             onClick={() => setIsActionsExpanded((prev) => !prev)}
-            className='cursor-pointer'
+            className='cursor-pointer relative z-10 self-end'
           >
             <ActionsCounter
               count={statement.actions?.length ?? 0}
               expanded={isActionsExpanded}
             />
           </div>
+        </div>
+      </div>
+
+      {/* Mobile layout (smaller than xs breakpoint) - Two row layout */}
+      <div className='xs:hidden flex flex-col space-y-2'>
+        {/* First row: Privacy icon, Statement text, Menu button */}
+        <div className='flex items-start justify-between'>
+          <div className='flex items-start space-x-2 flex-1 min-w-0'>
+            {/* Privacy status icon */}
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <span
+                  className={`inline-flex items-center justify-center flex-shrink-0 ${
+                    statement.isPublic ? 'text-green-500' : 'text-red-500'
+                  } ${statement.isArchived ? 'opacity-70' : ''}`}
+                >
+                  {statement.isPublic ? (
+                    <MailPlus size={16} className=' m-1' />
+                  ) : (
+                    <MailX size={16} />
+                  )}
+                </span>
+              </TooltipTrigger>
+              <TooltipContent className='p-2 bg-black text-white rounded'>
+                {statement.isPublic
+                  ? 'You are sharing this statement'
+                  : 'This statement is private'}
+              </TooltipContent>
+            </Tooltip>
+
+            {/* Statement text with archived styling if needed */}
+            <div className='flex-1 min-w-0'>
+              <span
+                className={`${
+                  statement.isArchived ? 'text-gray-500' : ''
+                } break-words line-clamp-2`}
+              >
+                {`${statement.atoms.subject} ${getVerbName(
+                  statement.atoms.verb
+                )} ${statement.atoms.object}`}
+              </span>
+            </div>
+          </div>
+
+          {/* Menu button */}
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
-              <button onClick={(e) => e.stopPropagation()}>
-                <MoreVertical size={18} className='text-gray-500' />
+              <button
+                onClick={(e) => e.stopPropagation()}
+                className='p-1.5 rounded-full hover:bg-gray-200 transition-colors ml-2 flex-shrink-0'
+              >
+                <Settings size={18} className='text-gray-600' />
               </button>
             </DropdownMenuTrigger>
             <DropdownMenuContent align='end'>
@@ -750,15 +832,15 @@ const StatementItem: React.FC<StatementItemProps> = ({
                 <Trash2 className='mr-2 h-4 w-4' />
                 Delete
               </DropdownMenuItem>
-              <DropdownMenuItem onClick={() => onToggleResolved(statement.id)}>
-                {statement.isResolved ? (
+              <DropdownMenuItem onClick={() => onToggleArchived(statement.id)}>
+                {statement.isArchived ? (
                   <>
-                    <ArchiveRestore className='mr-2 h-4 w-4 text-red-500' />
+                    <ArchiveRestore className='mr-2 h-4 w-4 text-gray-600' />
                     Unarchive
                   </>
                 ) : (
                   <>
-                    <Archive className='mr-2 h-4 w-4 text-green-500' />
+                    <Archive className='mr-2 h-4 w-4 text-gray-600' />
                     Archive
                   </>
                 )}
@@ -773,10 +855,24 @@ const StatementItem: React.FC<StatementItemProps> = ({
             </DropdownMenuContent>
           </DropdownMenu>
         </div>
+
+        {/* Second row: Action counter (right aligned) */}
+        <div className='flex justify-end mb-0'>
+          {/* Action counter - rightmost element */}
+          <div
+            onClick={() => setIsActionsExpanded((prev) => !prev)}
+            className='cursor-pointer relative z-10 flex-shrink-0 self-end'
+          >
+            <ActionsCounter
+              count={statement.actions?.length ?? 0}
+              expanded={isActionsExpanded}
+            />
+          </div>
+        </div>
       </div>
 
       {isActionsExpanded && (
-        <div className='mt-2'>
+        <div className='border md:border-2 border-brand-pink rounded-b-lg rounded-tl-lg p-2 bg-white !mt-0'>
           <ActionLine
             statementId={statement.id}
             actions={statement.actions ?? []}
@@ -797,32 +893,36 @@ const StatementItem: React.FC<StatementItemProps> = ({
               // Create a copy of the entire statement
               const statementToUpdate = { ...statement };
               const updatedActions = [...(statementToUpdate.actions || [])];
-              const actionIndex = updatedActions.findIndex(a => a.id === actionId);
-              
+              const actionIndex = updatedActions.findIndex(
+                (a) => a.id === actionId
+              );
+
               if (actionIndex !== -1) {
                 // Create an updated action with gratitude information
                 const action = updatedActions[actionIndex];
                 const updatedAction = {
                   ...action,
-                  gratitudeSent: true,
-                  gratitudeMessage: message,
-                  gratitudeSentDate: new Date().toISOString()
+                  gratitude: {
+                    sent: true,
+                    message: message,
+                    sentDate: new Date().toISOString(),
+                  },
                 };
-                
+
                 // Replace the action in the array
                 updatedActions[actionIndex] = updatedAction;
-                
+
                 // Update the statement with the updated actions
                 statementToUpdate.actions = updatedActions;
-                
+
                 // Call onEditAction for UI updates (but it won't save the gratitude fields)
                 if (onEditAction) {
                   onEditAction(statement.id, actionId, {
                     text: action.action,
-                    dueDate: action.byDate
+                    dueDate: action.byDate,
                   });
                 }
-                
+
                 // Call onLocalSave to save the entire updated statement with gratitude info
                 if (onLocalSave) {
                   onLocalSave(statementToUpdate);
diff --git a/src/features/statements/components/StatementList.tsx b/src/features/statements/components/StatementList.tsx
index f6b4ab3..7fdf256 100644
--- a/src/features/statements/components/StatementList.tsx
+++ b/src/features/statements/components/StatementList.tsx
@@ -20,12 +20,12 @@ import { Button } from '../../../components/ui/button';
 const normalizeCategoryIdForGrouping = (id: string): string => {
   // Convert to lowercase and handle special cases
   const normalized = id ? id.toLowerCase() : '';
-  
+
   // Handle variations of "uncategorized"
   if (['uncategorized', 'uncategorised'].includes(normalized)) {
     return 'uncategorized';
   }
-  
+
   return normalized;
 };
 
@@ -33,9 +33,9 @@ const normalizeCategoryIdForGrouping = (id: string): string => {
 const mapToPredefinedCategoryId = (categoryId: string): string => {
   const normalized = normalizeCategoryIdForGrouping(categoryId);
   const predefinedCategory = statementsCategories.categories.find(
-    c => normalizeCategoryIdForGrouping(c.id) === normalized
+    (c) => normalizeCategoryIdForGrouping(c.id) === normalized
   );
-  
+
   return predefinedCategory ? predefinedCategory.id : categoryId;
 };
 
@@ -52,7 +52,9 @@ const groupQuestionsByCategory = (questions: SetQuestion[]) => {
 const groupStatementsByCategory = (statements: Entry[]) => {
   return statements.reduce<Record<string, Entry[]>>((acc, statement) => {
     // Use the predefined category ID if it exists, otherwise use the normalized ID
-    const cat = mapToPredefinedCategoryId(statement.category || 'Uncategorized');
+    const cat = mapToPredefinedCategoryId(
+      statement.category || 'Uncategorized'
+    );
     if (!acc[cat]) acc[cat] = [];
     acc[cat].push(statement);
     return acc;
@@ -61,19 +63,15 @@ const groupStatementsByCategory = (statements: Entry[]) => {
 
 interface StatementListProps {
   username: string;
-  onAddCustomStatement?: () => void;
 }
 
-const StatementList: React.FC<StatementListProps> = ({ 
-  username,
-  onAddCustomStatement 
-}) => {
+const StatementList: React.FC<StatementListProps> = ({ username }) => {
   const { data, setData } = useEntries();
   const { entries } = data;
 
   const [usedPresetQuestions, setUsedPresetQuestions] = useState<string[]>([]);
   const { questions, setQuestions } = useQuestions();
-  
+
   // Get available preset questions (not used and not in snoozed section)
   const presetQuestions = questions.filter(
     (q) => !usedPresetQuestions.includes(q.id) && !q.isSnoozed
@@ -88,8 +86,9 @@ const StatementList: React.FC<StatementListProps> = ({
     statementId: string | null;
   }>({ isOpen: false, statementId: null });
   const [isWizardOpen, setIsWizardOpen] = useState(false);
-  const [selectedPresetQuestion, setSelectedPresetQuestion] =
-    useState<SetQuestion | null>(null);
+  const [selectedPresetQuestion, setSelectedPresetQuestion] = useState<
+    SetQuestion | undefined
+  >(undefined);
 
   // State for editing mode:
   const [editingStatementId, setEditingStatementId] = useState<string | null>(
@@ -100,38 +99,41 @@ const StatementList: React.FC<StatementListProps> = ({
     statement: Entry;
     editPart: 'subject' | 'verb' | 'object' | 'category' | 'privacy';
   } | null>(null);
-  
+
   // Keep a backup of the original entries when entering edit mode
-  const [originalEntries, setOriginalEntries] = useState<{[id: string]: Entry}>({});
-  
+  const [originalEntries, setOriginalEntries] = useState<{
+    [id: string]: Entry;
+  }>({});
+
   // Store original categories to compare when statements are edited
-  const [originalCategories, setOriginalCategories] = useState<{[id: string]: string}>({});
+  const [originalCategories, setOriginalCategories] = useState<{
+    [id: string]: string;
+  }>({});
 
-  // Handle toggling the resolved state (archive/unarchive)
-  const handleToggleResolved = (statementId: string) => {
+  // Handle toggling the archive state (archive/unarchive)
+  const handleToggleArchived = (statementId: string) => {
     const stmt = entries.find((s) => s.id === statementId);
     if (!stmt) return;
-    const updated = { ...stmt, isResolved: !stmt.isResolved };
+    const updated = { ...stmt, isArchived: !stmt.isArchived };
     setData({ type: 'UPDATE_ENTRY', payload: updated });
     updateEntry(updated);
   };
-  
-  
+
   // Handle toggling the snoozed state for questions
   const handleToggleQuestionSnooze = (questionId: string) => {
     // Find the question in the questions array
-    const questionToToggle = questions.find(q => q.id === questionId);
+    const questionToToggle = questions.find((q) => q.id === questionId);
     if (!questionToToggle) return;
-    
+
     // Create a new array with the updated question
-    const updatedQuestions = questions.map(q => {
+    const updatedQuestions = questions.map((q) => {
       if (q.id === questionId) {
         if (q.isSnoozed) {
           // Unsnooze - restore to original category if available
           return {
             ...q,
             isSnoozed: false,
-            category: q.originalCategory || q.category
+            category: q.originalCategory || q.category,
           };
         } else {
           // Snooze - store original category and move to snoozed
@@ -139,13 +141,13 @@ const StatementList: React.FC<StatementListProps> = ({
             ...q,
             isSnoozed: true,
             originalCategory: q.category,
-            category: 'snoozed'
+            category: 'snoozed',
           };
         }
       }
       return q;
     });
-    
+
     // Update the questions in context
     setQuestions(updatedQuestions);
   };
@@ -171,24 +173,24 @@ const StatementList: React.FC<StatementListProps> = ({
     try {
       // Call the backend API with the updated entry
       await updateEntry(updatedEntry);
-      
+
       // Update the context with the new entry
       setData({ type: 'UPDATE_ENTRY', payload: updatedEntry });
-      
+
       // Remove from originalEntries since we've saved
-      setOriginalEntries(prev => {
-        const newEntries = {...prev};
+      setOriginalEntries((prev) => {
+        const newEntries = { ...prev };
         delete newEntries[updatedEntry.id];
         return newEntries;
       });
-      
+
       // Remove from originalCategories
-      setOriginalCategories(prev => {
-        const newCategories = {...prev};
+      setOriginalCategories((prev) => {
+        const newCategories = { ...prev };
         delete newCategories[updatedEntry.id];
         return newCategories;
       });
-      
+
       // Exit editing mode for this statement
       setEditingStatementId(null);
     } catch (error) {
@@ -208,12 +210,12 @@ const StatementList: React.FC<StatementListProps> = ({
       setUsedPresetQuestions((prev) => [...prev, selectedPresetQuestion.id]);
     }
     setIsWizardOpen(false);
-    setSelectedPresetQuestion(null);
+    setSelectedPresetQuestion(undefined);
   };
 
   const handleWizardClose = () => {
     setIsWizardOpen(false);
-    setSelectedPresetQuestion(null);
+    setSelectedPresetQuestion(undefined);
   };
 
   const handleDeleteClick = (statementId: string) => {
@@ -237,21 +239,21 @@ const StatementList: React.FC<StatementListProps> = ({
   // Single edit option: when user clicks "Edit" in the dropdown
   const handleEditClick = (statementId: string) => {
     // Store the original entry for possible reversion later
-    const entryToEdit = entries.find(e => e.id === statementId);
+    const entryToEdit = entries.find((e) => e.id === statementId);
     if (entryToEdit) {
       // Store the full entry for restoring on cancel
-      setOriginalEntries(prev => ({
+      setOriginalEntries((prev) => ({
         ...prev,
-        [statementId]: JSON.parse(JSON.stringify(entryToEdit))
+        [statementId]: JSON.parse(JSON.stringify(entryToEdit)),
       }));
-      
+
       // Store the original category for change detection
-      setOriginalCategories(prev => ({
+      setOriginalCategories((prev) => ({
         ...prev,
-        [statementId]: entryToEdit.category || ''
+        [statementId]: entryToEdit.category || '',
       }));
     }
-    
+
     // Enable edit mode
     setEditingStatementId(statementId);
   };
@@ -267,20 +269,6 @@ const StatementList: React.FC<StatementListProps> = ({
     }
   };
 
-  // const handlePartUpdate = (
-  //   statementId: string,
-  //   part: 'subject' | 'verb' | 'object',
-  //   value: string
-  // ) => {
-  //   const updatedEntries = entries.map((entry) =>
-  //     entry.id === statementId
-  //       ? { ...entry, atoms: { ...entry.atoms, [part]: value } }
-  //       : entry
-  //   );
-  //   // Update only context
-  //   setData({ type: 'SET_ENTRIES', payload: updatedEntries });
-  // };
-
   const handleResetClick = (statementId: string) => {
     const statementToReset = entries.find((s) => s.id === statementId);
     if (statementToReset && statementToReset.presetId) {
@@ -345,44 +333,61 @@ const StatementList: React.FC<StatementListProps> = ({
   };
 
   // State for managing the visibility of the snoozed section - default to expanded
-  const [isSnoozedQuestionsSectionExpanded, setIsSnoozedQuestionsSectionExpanded] = useState(true);
-  
+  const [
+    isSnoozedQuestionsSectionExpanded,
+    setIsSnoozedQuestionsSectionExpanded,
+  ] = useState(true);
+
   // Move the hook call to the top level
   const { categoryCounts } = useAnsweredCountByCategory();
-  
+
   const renderCategorySection = (catId: string, catLabel: string) => {
     // Don't render the snoozed category in the normal flow
     if (catId === 'snoozed') return null;
-    
+
     const presetForCat = questionsByCategory[catId] || [];
     const statementsForCat = statementsByCategory[catId] || [];
     if (presetForCat.length === 0 && statementsForCat.length === 0) return null;
 
     // Normalize the category ID for consistent comparison
     const normalizedCatId = normalizeCategoryIdForGrouping(catId);
-    
+
     // We're now using a consistent styling regardless of category
-    
+
     // Use the pre-fetched category counts
-    const categoryStatus = categoryCounts[normalizedCatId] || { answered: 0, total: 0 };
-    const isComplete = categoryStatus.total > 0 && categoryStatus.answered === categoryStatus.total;
-    
-    
+    const categoryStatus = categoryCounts[normalizedCatId] || {
+      answered: 0,
+      total: 0,
+    };
+    const isComplete =
+      categoryStatus.total > 0 &&
+      categoryStatus.answered === categoryStatus.total;
+
     return (
-      <div key={catId} className='mb-8'>
+      <div key={catId} className='mb-4 md:mb-8 category-section'>
         {/* Folder Tab Design */}
         <div className={`relative z-10`}>
-          <div 
-            className={`inline-block px-4 py-2 rounded-t-lg ${isComplete ? 'bg-green-200 border-green-500' : 'bg-slate-100 border-slate-300'} border-t border-l border-r border-b-0`}
+          <div
+            className={`inline-block px-4 py-1 md:py-2 rounded-t-lg ${
+              isComplete
+                ? 'bg-green-200 border-green-500'
+                : 'bg-slate-100 border-slate-300'
+            } border-t border-l border-r border-b-0`}
           >
             <h3 className='text-lg font-semibold'>
               {formatCategoryName(catLabel)}
             </h3>
           </div>
         </div>
-        
+
         {/* Folder Content */}
-        <div className={`border rounded-tr-lg rounded-b-lg p-4 -mt-[1px] ${isComplete ? 'bg-white border-green-500' : 'bg-white border-slate-300'}`}>
+        <div
+          className={`border rounded-tr-lg rounded-b-lg p-2 md:p-4 -mt-[1px] ${
+            isComplete
+              ? 'bg-white border-green-500'
+              : 'bg-white border-slate-300'
+          }`}
+        >
           {presetForCat.length > 0 && (
             <ul className='space-y-2'>
               {presetForCat.map((presetQuestion) => (
@@ -413,24 +418,24 @@ const StatementList: React.FC<StatementListProps> = ({
                         // Restore the original entry from our backup
                         setData({
                           type: 'UPDATE_ENTRY',
-                          payload: originalEntries[statement.id]
+                          payload: originalEntries[statement.id],
                         });
-                        
+
                         // Remove from originalEntries and originalCategories
-                        setOriginalEntries(prev => {
-                          const newEntries = {...prev};
+                        setOriginalEntries((prev) => {
+                          const newEntries = { ...prev };
                           delete newEntries[statement.id];
                           return newEntries;
                         });
-                        
+
                         // Also clear from original categories
-                        setOriginalCategories(prev => {
-                          const newCategories = {...prev};
+                        setOriginalCategories((prev) => {
+                          const newCategories = { ...prev };
                           delete newCategories[statement.id];
                           return newCategories;
                         });
                       }
-                      
+
                       // Exit edit mode
                       setEditingStatementId(null);
                     }}
@@ -444,7 +449,7 @@ const StatementList: React.FC<StatementListProps> = ({
                         ? () => handleResetClick(statement.id)
                         : undefined
                     }
-                    onToggleResolved={handleToggleResolved}
+                    onToggleArchived={handleToggleArchived}
                     onToggleActionResolved={(actionId: string) =>
                       handleToggleActionResolved(statement.id, actionId)
                     }
@@ -457,29 +462,44 @@ const StatementList: React.FC<StatementListProps> = ({
       </div>
     );
   };
-  
-  
+
   // Special renderer for the snoozed questions section
   const renderSnoozedQuestionsSection = () => {
     // Filter questions to get snoozed ones
-    const snoozedQuestions = questions.filter(q => q.isSnoozed);
+    const snoozedQuestions = questions.filter((q) => q.isSnoozed);
     if (snoozedQuestions.length === 0) return null;
-    
+
     return (
       <div className='mb-8 mt-4'>
-        {/* New and improved Snoozed Questions section */}
-        <div className={`border rounded-lg overflow-hidden bg-white ${isSnoozedQuestionsSectionExpanded ? 'border-blue-300' : 'border-blue-200'}`}>
+        {/* Snoozed Questions section */}
+        <div
+          className={`border rounded-lg overflow-hidden bg-white ${
+            isSnoozedQuestionsSectionExpanded
+              ? 'border-blue-300'
+              : 'border-blue-200'
+          }`}
+        >
           {/* Header/Tab that's always visible */}
-          <div 
-            className={`flex items-center justify-between px-4 py-3 bg-blue-100 cursor-pointer ${isSnoozedQuestionsSectionExpanded ? 'border-b border-blue-300' : ''}`}
-            onClick={() => setIsSnoozedQuestionsSectionExpanded(!isSnoozedQuestionsSectionExpanded)}
+          <div
+            className={`flex items-center justify-between px-4 py-3 bg-blue-100 cursor-pointer ${
+              isSnoozedQuestionsSectionExpanded
+                ? 'border-b border-blue-300'
+                : ''
+            }`}
+            onClick={() =>
+              setIsSnoozedQuestionsSectionExpanded(
+                !isSnoozedQuestionsSectionExpanded
+              )
+            }
           >
-            <h3 className='text-lg font-semibold flex items-center text-blue-700'>
+            <h2 className='text-lg font-semibold flex items-center text-blue-700'>
               <BellOff className='h-5 w-5 mr-2' />
               Snoozed Questions
-            </h3>
+            </h2>
             <div className='flex items-center'>
-              <span className="mr-2 text-blue-700 font-medium">({snoozedQuestions.length})</span>
+              <span className='mr-2 text-blue-700 font-medium'>
+                ({snoozedQuestions.length})
+              </span>
               {isSnoozedQuestionsSectionExpanded ? (
                 <ChevronUp className='h-5 w-5 text-blue-600' />
               ) : (
@@ -487,16 +507,18 @@ const StatementList: React.FC<StatementListProps> = ({
               )}
             </div>
           </div>
-          
+
           {/* Content section that appears/disappears */}
           {isSnoozedQuestionsSectionExpanded && (
-            <div className="p-4 bg-white">
+            <div className='p-2 sm:p-4 bg-white'>
               <ul className='space-y-2'>
                 {snoozedQuestions.map((question) => (
                   <li key={`snoozed-${question.id}`}>
                     <QuestionCard
                       presetQuestion={question}
-                      onSelect={() => {/* Disabled for snoozed questions */}}
+                      onSelect={() => {
+                        /* Disabled for snoozed questions */
+                      }}
                       onToggleSnooze={handleToggleQuestionSnooze}
                     />
                   </li>
@@ -521,55 +543,67 @@ const StatementList: React.FC<StatementListProps> = ({
   // Helper function to find category name from ID
   const getCategoryName = (categoryId: string): string => {
     // First check if it's in our defined categories
-    const category = definedCategories.find(c => 
-      normalizeCategoryIdForGrouping(c.id) === normalizeCategoryIdForGrouping(categoryId)
+    const category = definedCategories.find(
+      (c) =>
+        normalizeCategoryIdForGrouping(c.id) ===
+        normalizeCategoryIdForGrouping(categoryId)
     );
-    
+
     if (category) {
       return category.name;
     }
-    
+
     // Check for uncategorized variations
-    if (['uncategorized', 'uncategorised'].includes(normalizeCategoryIdForGrouping(categoryId))) {
+    if (
+      ['uncategorized', 'uncategorised'].includes(
+        normalizeCategoryIdForGrouping(categoryId)
+      )
+    ) {
       return 'Uncategorized';
     }
-    
+
     // If not found, return the ID with formatting
     return formatCategoryName(categoryId);
   };
 
   return (
     <>
-      <div className='mt-8 bg-white rounded-xl shadow-lg p-6 w-full'>
+      <div
+        id='mainContentArea'
+        className='my-2 md:my-8 bg-white rounded-xl shadow-lg p-3 md:p-6 w-full'
+      >
         {/* Regular categories */}
         {definedCategories.map((cat) =>
           renderCategorySection(cat.id, cat.name)
         )}
-        {extraCategoryIds.map((catId) => renderCategorySection(catId, getCategoryName(catId)))}
-        
-        {/* Snoozed sections */}
-        {renderSnoozedQuestionsSection()}
-        
+        {extraCategoryIds.map((catId) =>
+          renderCategorySection(catId, getCategoryName(catId))
+        )}
+
         {/* Add custom statement section */}
-        {onAddCustomStatement && (
-          <div className="mt-8 border-t pt-8 text-center">
-            <div className="max-w-md mx-auto">
-              <h3 className="text-lg font-medium text-gray-700 mb-2">Want to add your own statement?</h3>
-              <p className="text-gray-500 mb-4">
-                Create a custom statement to add anything that's not covered by the questions above.
-              </p>
-              <Button
-                onClick={onAddCustomStatement}
-                variant="pink"
-                className="flex items-center px-6 py-2 mx-auto shadow-sm"
-              >
-                <Plus className="w-5 h-5 mr-2" />
-                <span>Add custom statement</span>
-              </Button>
-            </div>
+        <div className='my-8 text-center'>
+          <div className='max-w-md mx-auto'>
+            <h2 className='text-lg font-medium text-gray-700 mb-2'>
+              Want to add your own statement?
+            </h2>
+
+            <Button
+              onClick={() => {
+                setSelectedPresetQuestion(undefined);
+                setIsWizardOpen(true);
+              }}
+              variant='pink'
+              className='flex items-center px-6 py-2 mx-auto shadow-sm add-custom-button'
+            >
+              <Plus className='w-5 h-5 mr-2' />
+              <span>Add custom statement</span>
+            </Button>
           </div>
-        )}
-        
+        </div>
+
+        {/* Snoozed sections */}
+        {renderSnoozedQuestionsSection()}
+
         <ConfirmationDialog
           isOpen={deleteConfirmation.isOpen}
           onClose={handleDeleteCancel}
@@ -578,7 +612,7 @@ const StatementList: React.FC<StatementListProps> = ({
           description='Are you sure you want to delete this statement? This action cannot be undone.'
         />
       </div>
-      {isWizardOpen && selectedPresetQuestion && (
+      {isWizardOpen && (
         <StatementWizard
           username={username}
           presetQuestion={selectedPresetQuestion}
@@ -592,22 +626,27 @@ const StatementList: React.FC<StatementListProps> = ({
           editPart={editModalData.editPart}
           username={username}
           onUpdate={(updatedStatement) => {
-            console.log("====== MODAL UPDATE SEQUENCE START ======");
-            console.log("1. EditStatementModal returned updated statement:", updatedStatement);
-            console.log("2. Current editing state:", { 
+            console.log('====== MODAL UPDATE SEQUENCE START ======');
+            console.log(
+              '1. EditStatementModal returned updated statement:',
+              updatedStatement
+            );
+            console.log('2. Current editing state:', {
               isEditing: editingStatementId === updatedStatement.id,
-              editingStatementId, 
-              updatedStatementId: updatedStatement.id 
+              editingStatementId,
+              updatedStatementId: updatedStatement.id,
             });
-            
+
             // If we're in editing mode for this statement:
             if (editingStatementId === updatedStatement.id) {
-              console.log("3. EDIT MODE PATH: Will update UI without saving to backend");
-              console.log("4. Original entries stored:", originalEntries);
-              
+              console.log(
+                '3. EDIT MODE PATH: Will update UI without saving to backend'
+              );
+              console.log('4. Original entries stored:', originalEntries);
+
               // In edit mode, we need to update the data without saving to backend yet
               // But we must ensure the original values in StatementItem aren't updated
-              
+
               // Create a completely isolated copy with a unique timestamp
               const markedEntry = {
                 ...JSON.parse(JSON.stringify(updatedStatement)),
@@ -615,44 +654,51 @@ const StatementList: React.FC<StatementListProps> = ({
                 _updateTimestamp: Date.now(),
                 _forceUpdate: Math.random().toString(),
               };
-              
-              console.log("5. Will dispatch UPDATE_ENTRY with:", markedEntry);
-              
+
+              console.log('5. Will dispatch UPDATE_ENTRY with:', markedEntry);
+
               // Before updating the global state, log the current statements
-              const existingEntry = entries.find(e => e.id === updatedStatement.id);
-              console.log("6. Current entries before update:", existingEntry);
-              
+              const existingEntry = entries.find(
+                (e) => e.id === updatedStatement.id
+              );
+              console.log('6. Current entries before update:', existingEntry);
+
               // Log potential category changes
-              console.log("CATEGORY CHANGE CHECK:", {
+              console.log('CATEGORY CHANGE CHECK:', {
                 existingCategory: existingEntry?.category,
                 newCategory: markedEntry.category,
                 changed: existingEntry?.category !== markedEntry.category,
-                equal: existingEntry?.category === markedEntry.category
+                equal: existingEntry?.category === markedEntry.category,
               });
-              
+
               // Update the UI with the new values
               setData({ type: 'UPDATE_ENTRY', payload: markedEntry });
-              
-              console.log("7. UPDATE_ENTRY action dispatched");
-              
+
+              console.log('7. UPDATE_ENTRY action dispatched');
+
               // Log what will happen next
-              console.log("8. This will trigger a re-render of StatementItem with:", {
-                statementId: updatedStatement.id,
-                isEditing: true,
-                newStatementCategory: markedEntry.category,
-                editingStatementId
-              });
+              console.log(
+                '8. This will trigger a re-render of StatementItem with:',
+                {
+                  statementId: updatedStatement.id,
+                  isEditing: true,
+                  newStatementCategory: markedEntry.category,
+                  editingStatementId,
+                }
+              );
             } else {
-              console.log("3. DIRECT SAVE PATH: Will update both UI and backend");
-              
+              console.log(
+                '3. DIRECT SAVE PATH: Will update both UI and backend'
+              );
+
               // If we're not in edit mode, save directly when modal is closed
               setData({ type: 'UPDATE_ENTRY', payload: updatedStatement });
               // Also update backend
               updateEntry(updatedStatement);
-              
-              console.log("4. Direct save completed");
+
+              console.log('4. Direct save completed');
             }
-            console.log("====== MODAL UPDATE SEQUENCE END ======");
+            console.log('====== MODAL UPDATE SEQUENCE END ======');
           }}
           onClose={() => setEditModalData(null)}
         />
diff --git a/src/features/statements/context/EntriesContext.ts b/src/features/statements/context/EntriesContext.ts
index fe39b0c..72f34e5 100644
--- a/src/features/statements/context/EntriesContext.ts
+++ b/src/features/statements/context/EntriesContext.ts
@@ -10,6 +10,7 @@ export interface EntriesContextType {
   data: {
     entries: Entry[];
     username: string;
+    userEmail: string;
     managerName: string;
     managerEmail: string;
     // Add originalCategories to the context data
@@ -20,6 +21,7 @@ export interface EntriesContextType {
 
 export type EntriesAction =
   | { type: 'SET_USERNAME'; payload: string }
+  | { type: 'SET_USER_EMAIL'; payload: string }
   | { type: 'SET_MANAGER_NAME'; payload: string }
   | { type: 'SET_MANAGER_EMAIL'; payload: string }
   | { type: 'SET_ENTRIES'; payload: Entry[] }
diff --git a/src/features/statements/context/EntriesProvider.tsx b/src/features/statements/context/EntriesProvider.tsx
index ec0cdb7..cc1615b 100644
--- a/src/features/statements/context/EntriesProvider.tsx
+++ b/src/features/statements/context/EntriesProvider.tsx
@@ -12,6 +12,8 @@ const EntriesReducer = (
   switch (action.type) {
     case 'SET_USERNAME':
       return { ...data, username: action.payload };
+    case 'SET_USER_EMAIL':
+      return { ...data, userEmail: action.payload };
     case 'SET_MANAGER_NAME':
       return { ...data, managerName: action.payload };
     case 'SET_MANAGER_EMAIL':
@@ -79,6 +81,7 @@ export const EntriesProvider: React.FC<EntriesProviderProps> = ({
   const [data, setData] = useReducer(EntriesReducer, {
     entries: [],
     username: '',
+    userEmail: '',
     managerName: '',
     managerEmail: '',
     originalCategories: {} // Initialize the originalCategories store
@@ -96,8 +99,8 @@ export const EntriesProvider: React.FC<EntriesProviderProps> = ({
       
       // If we have a user object with an email
       if (event.detail?.user?.email) {
-        // Update manager email from auth state - ALWAYS update, don't check if empty
-        setData({ type: 'SET_MANAGER_EMAIL', payload: event.detail.user.email });
+        // Store user email from auth (this is the email they used for magic link)
+        setData({ type: 'SET_USER_EMAIL', payload: event.detail.user.email });
       }
     };
     
diff --git a/src/features/wizard/components/FilterBar.tsx b/src/features/wizard/components/FilterBar.tsx
index 9de212f..fb20bf8 100644
--- a/src/features/wizard/components/FilterBar.tsx
+++ b/src/features/wizard/components/FilterBar.tsx
@@ -83,12 +83,12 @@ const FilterBar: React.FC<FilterBarProps> = ({
       <div className='bg-gray-50 px-3 py-1 flex-1'>
         {/* CASE 1: No filter selected → show top-level categories in a grid */}
         {!currentCategory && (
-          <div className='grid grid-cols-3 gap-1.5 sm:grid-cols-4 md:grid-cols-5 justify-items-center'>
+          <div className='grid grid-cols-3 gap-2 sm:grid-cols-4 md:grid-cols-5 justify-items-stretch'>
             {topCategories.map((cat) => (
               <button
                 key={cat.id}
                 onClick={() => onSelectCategory(cat)}
-                className='flex flex-col items-center justify-center gap-1 p-1.5 rounded hover:bg-gray-100 transition-colors text-center w-full max-w-[90px]'
+                className='flex flex-col items-center justify-center gap-1 p-1.5 rounded hover:bg-gray-100 transition-colors text-center w-full min-w-[80px]'
                 style={{
                   color: getContrastColor(cat.color),
                 }}
@@ -99,7 +99,7 @@ const FilterBar: React.FC<FilterBarProps> = ({
                 >
                   {cat.icon || '•'}
                 </div>
-                <span className='text-xs font-medium text-gray-700 line-clamp-1'>
+                <span className='text-xs font-medium text-gray-700 break-words'>
                   {cat.displayName}
                 </span>
               </button>
@@ -111,12 +111,12 @@ const FilterBar: React.FC<FilterBarProps> = ({
         {currentCategory &&
           currentCategory.children &&
           currentCategory.children.length > 0 && (
-            <div className='grid grid-cols-3 gap-1.5 sm:grid-cols-4 md:grid-cols-5 justify-items-center'>
+            <div className='grid grid-cols-3 gap-2 sm:grid-cols-4 md:grid-cols-5 justify-items-stretch'>
               {currentCategory.children.map((child) => (
                 <button
                   key={child.id}
                   onClick={() => onSelectCategory(child)}
-                  className='flex flex-col items-center justify-center gap-1 p-1.5 rounded hover:bg-gray-100 transition-colors text-center w-full max-w-[90px]'
+                  className='flex flex-col items-center justify-center gap-1 p-1.5 rounded hover:bg-gray-100 transition-colors text-center w-full min-w-[80px]'
                   style={{
                     color: getContrastColor(child.color),
                   }}
@@ -127,7 +127,7 @@ const FilterBar: React.FC<FilterBarProps> = ({
                   >
                     {child.icon || '•'}
                   </div>
-                  <span className='text-xs font-medium text-gray-700 line-clamp-1'>
+                  <span className='text-xs font-medium text-gray-700 break-words'>
                     {child.displayName}
                   </span>
                 </button>
diff --git a/src/features/wizard/components/SentimentVerbPicker.tsx b/src/features/wizard/components/SentimentVerbPicker.tsx
index 67eda43..f347195 100644
--- a/src/features/wizard/components/SentimentVerbPicker.tsx
+++ b/src/features/wizard/components/SentimentVerbPicker.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import type { Verb, Category } from '@/types/entries';
 import verbData from '@/data/verbs.json';
 import categoryStructure from '@/data/categoryStructure.json';
@@ -22,6 +22,27 @@ const SentimentVerbPicker: React.FC<SentimentVerbPickerProps> = ({
   const [path, setPath] = useState<Category[]>([]);
   const rootCategory = categoryStructure.root as Category;
   const currentCategory = path.length > 0 ? path[path.length - 1] : null;
+  
+  // State to track if we should show the filter bar based on screen size
+  const [showFilterBar, setShowFilterBar] = useState(false);
+  
+  // Effect to handle screen size changes
+  useEffect(() => {
+    // Function to check if we're on a desktop/tablet
+    const checkScreenSize = () => {
+      // Use 768px (md breakpoint) as the threshold
+      setShowFilterBar(window.innerWidth >= 768);
+    };
+    
+    // Check initially
+    checkScreenSize();
+    
+    // Add listener for window resize
+    window.addEventListener('resize', checkScreenSize);
+    
+    // Clean up
+    return () => window.removeEventListener('resize', checkScreenSize);
+  }, []);
 
   // When a category is selected, push it onto the path.
   const handleSelectCategory = (cat: Category) => {
@@ -52,14 +73,18 @@ const SentimentVerbPicker: React.FC<SentimentVerbPickerProps> = ({
   });
 
   return (
-    <div className='flex flex-col h-full'>
-      <FilterBar
-        rootCategory={rootCategory}
-        currentCategory={currentCategory}
-        path={path}
-        onSelectCategory={handleSelectCategory}
-        onBreadcrumbClick={handleBreadcrumbClick}
-      />
+    <div className='flex flex-col h-full m-0'>
+      {showFilterBar && (
+        <div className="mb-3">
+          <FilterBar
+            rootCategory={rootCategory}
+            currentCategory={currentCategory}
+            path={path}
+            onSelectCategory={handleSelectCategory}
+            onBreadcrumbClick={handleBreadcrumbClick}
+          />
+        </div>
+      )}
       <VerbGrid
         verbs={filteredVerbs}
         rootCategory={rootCategory}
diff --git a/src/features/wizard/components/StatementPreview.tsx b/src/features/wizard/components/StatementPreview.tsx
index dc47ab8..b3df1e3 100644
--- a/src/features/wizard/components/StatementPreview.tsx
+++ b/src/features/wizard/components/StatementPreview.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Entry, Step } from '@/types/entries';
 import { getVerbName } from '@/lib/utils/verbUtils';
-import { MailPlus, MailX, FileText } from 'lucide-react';
+import { MailPlus, MailX } from 'lucide-react';
 import statementsCategories from '@/data/statementsCategories.json';
 
 interface StatementPreviewProps {
@@ -17,18 +17,37 @@ const StatementPreview: React.FC<StatementPreviewProps> = ({ selection }) => {
   // Get the current step from the wizard
   const currentStep = selection.currentStep ?? 'privacy';
 
-  // Only show the preview if we have at least a subject
-  const hasContent = Boolean(subject.trim());
+  // Determine if we're using a preset question (indicated by the complement step being present)
+  const isPresetQuestion = !selection.currentStep || selection.currentStep === 'complement' || Boolean(selection.presetId);
+  
+  // For custom statements, only show preview if we have at least a category
+  // For preset questions, show if we have a subject
+  const hasContent = isPresetQuestion ? Boolean(subject.trim()) : Boolean(category.trim());
 
   // Only show privacy icon if we've reached or passed that step
   const showPrivacyIcon =
     currentStep === 'privacy' || currentStep === 'complement';
 
-  // Only show category if we've reached or passed that step
-  const showCategory =
-    currentStep === 'category' ||
-    currentStep === 'privacy' ||
-    currentStep === 'complement';
+  // Only show category if:
+  // - For custom statements: on category step or beyond
+  // - For preset statements: don't show category at all (it's predetermined)
+  const showCategory = 
+    !isPresetQuestion && (
+      (currentStep === 'category') || 
+      (currentStep === 'subject') || 
+      (currentStep === 'verb') || 
+      (currentStep === 'object') || 
+      (currentStep === 'privacy')
+    );
+    
+  // Only show subject if we're on subject step or beyond
+  const showSubject = 
+    (currentStep === 'subject') || 
+    (currentStep === 'verb') || 
+    (currentStep === 'object') || 
+    (currentStep === 'category' && isPresetQuestion) || 
+    (currentStep === 'privacy') || 
+    (currentStep === 'complement');
 
   // Get category display name from ID
   const getCategoryName = (categoryId: string) => {
@@ -51,38 +70,44 @@ const StatementPreview: React.FC<StatementPreviewProps> = ({ selection }) => {
   if (!hasContent) return null;
 
   return (
-    <div className='w-full pl-2 pr-4 mt-3 mb-3 flex flex-wrap gap-1.5 items-center justify-start'>
+    <div className='w-full pl-2 pr-4 mt-0 mb-3 flex flex-wrap gap-1.5 items-center justify-start'>
       {/* Statement label */}
-      <div className='flex items-center mr-1 text-gray-500'>
+      {/* <div className='flex items-center mr-1 text-gray-500'>
         <FileText size={12} className='mr-1' />
         <span className='text-xs font-medium'>Statement:</span>
-      </div>
+      </div> */}
 
-      {/* Statement parts */}
-      {subject && (
+      {/* Statement parts in the correct order */}
+      
+      {/* Category (first for custom statements, hidden for preset questions) */}
+      {showCategory && category && !selection.presetId && (
+        <span className='px-1.5 py-0.5 text-xs rounded bg-categorySelector text-black flex items-center gap-1'>
+          <span className='mr-1'>📁</span>
+          {getCategoryName(category)}
+        </span>
+      )}
+      
+      {/* Subject (second step for custom) */}
+      {showSubject && subject && (
         <span className='px-1.5 py-0.5 text-xs rounded bg-subjectSelector text-black'>
           {subject}
         </span>
       )}
-      {verb && (
+      
+      {/* Verb */}
+      {verb && (currentStep === 'verb' || currentStep === 'object' || currentStep === 'privacy' || currentStep === 'complement') && (
         <span className='px-1.5 py-0.5 text-xs rounded bg-verbSelector text-black'>
           {getVerbName(verb)}
         </span>
       )}
-      {object && (
+      
+      {/* Object */}
+      {object && (currentStep === 'object' || currentStep === 'privacy' || currentStep === 'complement') && (
         <span className='px-1.5 py-0.5 text-xs rounded bg-objectInput text-black'>
           {object}
         </span>
       )}
 
-      {/* Category indicator (only show after category step) */}
-      {showCategory && category && (
-        <span className='px-1.5 py-0.5 text-xs rounded bg-categorySelector text-black flex items-center gap-1'>
-          <span className='mr-1'>📁</span>
-          {getCategoryName(category)}
-        </span>
-      )}
-
       {/* Privacy indicator (only show after privacy step) */}
       {showPrivacyIcon && (
         <span
diff --git a/src/features/wizard/components/StatementWizard.tsx b/src/features/wizard/components/StatementWizard.tsx
index fec1ca4..0195514 100644
--- a/src/features/wizard/components/StatementWizard.tsx
+++ b/src/features/wizard/components/StatementWizard.tsx
@@ -37,9 +37,10 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
   const isPreset = Boolean(presetQuestion);
 
   // Define steps: if preset, skip "category" and add "complement"
+  // For custom statements, show category first, then subject
   const steps: Exclude<Step, 'closed'>[] = isPreset
     ? ['subject', 'verb', 'object', 'privacy', 'complement']
-    : ['subject', 'verb', 'object', 'category', 'privacy'];
+    : ['category', 'subject', 'verb', 'object', 'privacy'];
 
   // Use design tokens for border colors via Tailwind’s arbitrary value syntax:
   const stepBorderColors: Record<Exclude<Step, 'closed'>, string> = {
@@ -75,9 +76,14 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
       setSelection((prev) => ({
         ...prev,
         atoms: { ...prev.atoms, subject: username },
+        // For preset questions, use the category from the preset
+        category: presetQuestion.category || 'uncategorised',
+        // Add the presetId to identify this as a preset question in the preview
+        presetId: presetQuestion.id,
       }));
     } else {
-      // For custom statements, set defaults:
+      // For custom statements, set default category to "uncategorised" 
+      // but still show the category screen first
       setSelection((prev) => ({
         ...prev,
         // Set default subject to username
@@ -107,9 +113,7 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
       presetId: presetQuestion ? presetQuestion.id : undefined,
       // Use the category ID directly - display name will be handled by the UI
       category:
-        presetQuestion?.category ||
-        selection.category ||
-        'Uncategorized',
+        presetQuestion?.category || selection.category || 'Uncategorized',
     };
 
     try {
@@ -129,10 +133,10 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
     if (isTransitioning) {
       return; // Prevent multiple rapid transitions
     }
-    
+
     // Set transitioning flag to prevent additional advances
     setIsTransitioning(true);
-    
+
     // Add a small delay to prevent double-click issues
     setTimeout(() => {
       if (currentStepIndex < steps.length - 1) {
@@ -140,7 +144,7 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
       } else {
         handleComplete();
       }
-      
+
       // Reset transition flag after a slightly longer delay
       setTimeout(() => {
         setIsTransitioning(false);
@@ -156,7 +160,7 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
     }
   };
 
-  // Optional: Define a validation function for the current step.
+  // Validation function for the current step.
   // This function should return true if the current step’s required data is valid.
   const isStepValid = (step: Exclude<Step, 'closed'>): boolean => {
     switch (step) {
@@ -167,7 +171,8 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
       case 'object':
         return selection.atoms.object.trim().length > 0;
       case 'category':
-        return selection.category.trim().length > 0;
+        // For custom statements (not preset), category must be selected
+        return isPreset || selection.category.trim().length > 0;
       case 'privacy':
         // Always valid since it's a boolean toggle.
         return true;
@@ -188,6 +193,7 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
             username={username}
             presetQuestion={presetQuestion}
             selection={selection.atoms.subject}
+            selectedCategory={selection.category} // Pass the selected category to filter descriptors
             onUpdate={(val) => {
               // If the same value is selected again, move to next step
               if (selection.atoms.subject === val) {
@@ -250,7 +256,8 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
               if (selection.category === val) {
                 goNext();
               } else {
-                // Otherwise, just update the selection
+                // Update the selection but don't automatically advance
+                // Let the user click Next or click the same category again to advance
                 setSelection((prev) => ({
                   ...prev,
                   category: val,
@@ -294,54 +301,74 @@ const StatementWizard: React.FC<StatementWizardProps> = ({
       <DialogContent
         className={`sm:max-w-[600px] p-0 w-full border-8 ${getBorderColor(
           currentStep
-        )}`}
+        )} flex flex-col max-h-[90vh]`}
       >
+        {/* Header Section - Always Visible */}
         {presetQuestion && (
-          <div className='px-4 py-3 bg-gray-200 border-b'>
-            <h2 className='text-xl font-bold'>{presetQuestion.mainQuestion}</h2>
+          <div className='p-2 md:p-5 bg-gray-200 border-b flex-shrink-0'>
+            <h2 className='text-base md:text-xl font-bold'>
+              {presetQuestion.mainQuestion}
+            </h2>
           </div>
         )}
         <DialogDescription className='sr-only'>Wizard Steps</DialogDescription>
         <DialogTitle className='sr-only'>Wizard Steps</DialogTitle>
-        <AnimatePresence mode='wait' initial={false}>
-          <motion.div
-            key={currentStep}
-            initial={{ opacity: 0, y: 20 }}
-            animate={{ opacity: 1, y: 0 }}
-            exit={{ opacity: 0, y: -20 }}
-            transition={{ duration: 0.2 }}
-          >
-            {renderStep()}
-          </motion.div>
-        </AnimatePresence>
-        {/* Navigation Panel */}
-        <div className='flex justify-center p-4 pb-4 mb-0 gap-4'>
-          <Button
-            onClick={goBack}
-            disabled={currentStepIndex === 0}
-            variant='outline'
-            className='shadow-sm'
-          >
-            <span>Back</span>
-          </Button>
-          <Button
-            variant='default'
-            className='shadow-sm'
-            onClick={
-              currentStepIndex === steps.length - 1 ? handleComplete : goNext
-            }
-            disabled={!isStepValid(currentStep) || isSubmitting}
-          >
-            <span>
-              {isSubmitting
-                ? 'Submitting...'
-                : currentStepIndex === steps.length - 1
-                ? 'Create Statement'
-                : 'Next'}
+        
+        {/* Scrollable Content Area */}
+        <div className='flex-grow overflow-y-auto min-h-0'>
+          <AnimatePresence mode='wait' initial={false}>
+            <motion.div
+              key={currentStep}
+              initial={{ opacity: 0, y: 20 }}
+              animate={{ opacity: 1, y: 0 }}
+              exit={{ opacity: 0, y: -20 }}
+              transition={{ duration: 0.2 }}
+            >
+              {renderStep()}
+            </motion.div>
+          </AnimatePresence>
+        </div>
+        
+        {/* Bottom Section - Always Visible */}
+        <div className='flex-shrink-0'>
+          {/* Navigation Panel */}
+          <div className='flex justify-center p-0 md:p-4 pb-2 mb-0 gap-6'>
+            <Button
+              onClick={goBack}
+              disabled={currentStepIndex === 0}
+              variant='outline'
+              className='shadow-sm p-2'
+            >
+              <span>Back</span>
+            </Button>
+            <Button
+              variant='default'
+              className='shadow-sm p-2'
+              onClick={
+                currentStepIndex === steps.length - 1 ? handleComplete : goNext
+              }
+              disabled={!isStepValid(currentStep) || isSubmitting}
+            >
+              <span>
+                {isSubmitting
+                  ? 'Submitting...'
+                  : currentStepIndex === steps.length - 1
+                  ? 'Create Statement'
+                  : 'Next'}
+              </span>
+            </Button>
+          </div>
+
+          {/* Divider to separate preview from wizard content */}
+          <div className='w-full border-t border-black my-2 relative'>
+            <span className='absolute left-0 right-0 text-center bg-white text-xs text-black px-2 -top-2 mx-auto w-fit'>
+              Statement Preview
             </span>
-          </Button>
+          </div>
+
+          {/* Preview - Always Visible */}
+          <StatementPreview selection={{ ...selection, currentStep }} />
         </div>
-        <StatementPreview selection={{...selection, currentStep}} />
       </DialogContent>
     </Dialog>
   );
diff --git a/src/features/wizard/components/StepContainer.tsx b/src/features/wizard/components/StepContainer.tsx
index d9678bc..8fd463b 100644
--- a/src/features/wizard/components/StepContainer.tsx
+++ b/src/features/wizard/components/StepContainer.tsx
@@ -21,28 +21,30 @@ const StepContainer: React.FC<StepContainerProps> = ({
   currentStep = 1,
   totalSteps = 5,
 }) => (
-  <div className='p-2 space-y-4'>
-    <div className='flex items-center mb-2'>
+  <div className='p-1 sm:p-2 space-y-2 sm:space-y-4'>
+    <div className='flex items-center mb-1 sm:mb-2 sticky top-0 bg-white z-10 py-1'>
       {showBack && onBack && (
         <Button
           variant='outline'
           size='compact'
           onClick={onBack}
-          className='mr-2 p-2'
+          className='mr-2 p-0 md:p-2'
         >
           <ArrowLeft className='w-4 h-4' />
         </Button>
       )}
       <div className='flex items-center'>
-        <div className='flex items-center justify-center w-6 h-6 rounded-full border border-gray-300 bg-gray-50 mr-2'>
+        <div className='flex items-center justify-center w-5 h-5 sm:w-6 sm:h-6 rounded-full border border-gray-300 bg-gray-50 mr-1 sm:mr-2 flex-shrink-0'>
           <span className='text-xs font-medium text-gray-500'>
             {currentStep}/{totalSteps}
           </span>
         </div>
-        <h2 className='text-md font-medium text-gray-700'>{subQuestion}</h2>
+        <h2 className='text-sm sm:text-md font-medium text-gray-700'>{subQuestion}</h2>
       </div>
     </div>
-    {children}
+    <div className='flex-grow overflow-visible'>
+      {children}
+    </div>
   </div>
 );
 
diff --git a/src/features/wizard/components/SubjectTiles.tsx b/src/features/wizard/components/SubjectTiles.tsx
index 703e243..2ef8bc2 100644
--- a/src/features/wizard/components/SubjectTiles.tsx
+++ b/src/features/wizard/components/SubjectTiles.tsx
@@ -11,18 +11,21 @@ interface SubjectTile {
 interface SubjectTilesProps {
   username: string;
   activePresetQuestion?: SetQuestion;
+  selectedCategory?: string;
   selectedValue: string;
   onSelect: (value: string) => void;
 }
 
 const getSubjectTiles = (
   username: string,
-  activePresetQuestion?: SetQuestion
+  activePresetQuestion?: SetQuestion,
+  selectedCategory?: string
 ): SubjectTile[] => {
   let descriptorOptions: string[] = [];
 
-  // Use the top-level category from the preset question, defaulting to 'wellbeing'
-  const categoryKey = activePresetQuestion?.category || 'wellbeing';
+  // Use the selected category if available, or the top-level category from the preset question
+  // defaulting to 'wellbeing' if neither is available
+  const categoryKey = selectedCategory || activePresetQuestion?.category || 'wellbeing';
   const data = descriptorsData as DescriptorsData;
   const category = data.descriptors.find(
     (d) => d.name.toLowerCase() === categoryKey.toLowerCase()
@@ -42,12 +45,13 @@ const getSubjectTiles = (
 export const SubjectTiles: React.FC<SubjectTilesProps> = ({
   username,
   activePresetQuestion,
+  selectedCategory,
   selectedValue,
   onSelect,
 }) => {
   const tiles = useMemo(
-    () => getSubjectTiles(username, activePresetQuestion),
-    [username, activePresetQuestion]
+    () => getSubjectTiles(username, activePresetQuestion, selectedCategory),
+    [username, activePresetQuestion, selectedCategory]
   );
 
   return (
@@ -57,7 +61,7 @@ export const SubjectTiles: React.FC<SubjectTilesProps> = ({
           key={tile.value}
           variant={'outline'}
           selected={selectedValue === tile.value}
-          className={`h-auto py-4 px-6 text-left flex flex-col items-start space-y-1  
+          className={`h-auto py-2 px-2 text-left flex flex-col items-start space-y-1  
       
           `}
           onClick={() => onSelect(tile.value)}
diff --git a/src/features/wizard/components/VerbGrid.tsx b/src/features/wizard/components/VerbGrid.tsx
index 16a58bf..c49706b 100644
--- a/src/features/wizard/components/VerbGrid.tsx
+++ b/src/features/wizard/components/VerbGrid.tsx
@@ -3,8 +3,8 @@
 import React from 'react';
 import { Button } from '@/components/ui/button';
 import type { Verb, Category } from '@/types/entries';
-import { getContrastColor } from '@/lib/utils/colorUtils';
 import { getVerbColor } from '@/lib/utils/categoryUtils';
+import { getContrastColor } from '@/lib/utils/colorUtils';
 
 interface VerbGridProps {
   verbs: Verb[];
@@ -21,23 +21,24 @@ const VerbGrid: React.FC<VerbGridProps> = ({
 }) => {
   const sortedVerbs = [...verbs].sort((a, b) => a.name.localeCompare(b.name));
   return (
-    <div className='grid grid-cols-3 sm:grid-cols-4 md:grid-cols-5 gap-4 p-4 overflow-auto border'>
+    <div className='grid grid-cols-3 sm:grid-cols-4 md:grid-cols-5 gap-2 md:gap-4 p-2 border overflow-y-auto max-h-[35vh] verb-grid'>
       {sortedVerbs.map((verb) => {
         const tileColor = getVerbColor(verb, rootCategory);
-
         const isSelected = verb.id === selectedVerbId;
+        
         return (
           <Button
             key={verb.name}
             onClick={() => onVerbSelect(verb)}
             variant={'outlineVerbs'}
             selected={isSelected}
-            className='flex items-center justify-center p-4 rounded-lg shadow-md'
+            className='flex items-center justify-center rounded-lg shadow-md'
             style={
               {
                 '--tile-color': tileColor,
-                color: isSelected ? getContrastColor(tileColor) : 'inherit',
                 borderColor: tileColor,
+                backgroundColor: isSelected ? tileColor : 'white',
+                color: isSelected ? getContrastColor(tileColor) : 'black',
               } as React.CSSProperties
             }
           >
diff --git a/src/features/wizard/components/VerbSelector.tsx b/src/features/wizard/components/VerbSelector.tsx
index beb48d3..c827fff 100644
--- a/src/features/wizard/components/VerbSelector.tsx
+++ b/src/features/wizard/components/VerbSelector.tsx
@@ -7,6 +7,7 @@ import { ChevronLeft, ChevronRight } from 'lucide-react';
 import categoryStructure from '../../../data/categoryStructure.json';
 import verbData from '../../../data/verbs.json';
 import type { Category, Verb } from '../../../types/entries';
+import { getContrastColor } from '@/lib/utils/colorUtils';
 
 interface VerbSelectorProps {
   onVerbSelect?: (verb: Verb) => void;
@@ -125,16 +126,17 @@ const VerbSelector: React.FC<VerbSelectorProps> = ({ onVerbSelect }) => {
     return renderGrid(
       verbs.map((verb) => {
         // Use this to highlight the selected verb
-        //const isSelected = selectedVerb ? verb.id === selectedVerb.id : false;
+        const isSelected = selectedVerb ? verb.id === selectedVerb.id : false;
         return (
           <motion.button
             key={verb.id} // use verb.id as key
             whileHover={{ scale: 1.05 }}
             whileTap={{ scale: 0.95 }}
-            className='p-4 rounded-lg shadow-md flex items-center justify-center text-center'
+            className={`p-4 rounded-lg shadow-md flex items-center justify-center text-center ${isSelected ? 'border-4' : 'border'}`}
             style={{
-              background: verb.color,
-              color: getContrastColor(verb.color),
+              background: isSelected ? verb.color : 'white',
+              borderColor: verb.color,
+              color: isSelected ? getContrastColor(verb.color) : 'black',
             }}
             onClick={() => handleVerbSelect(verb)}
           >
@@ -145,16 +147,10 @@ const VerbSelector: React.FC<VerbSelectorProps> = ({ onVerbSelect }) => {
     );
   };
 
-  const getContrastColor = (hexColor: string) => {
-    const r = Number.parseInt(hexColor.slice(1, 3), 16);
-    const g = Number.parseInt(hexColor.slice(3, 5), 16);
-    const b = Number.parseInt(hexColor.slice(5, 7), 16);
-    const yiq = (r * 299 + g * 587 + b * 114) / 1000;
-    return yiq >= 128 ? '#000000' : '#ffffff';
-  };
+  // Using getContrastColor from colorUtils.ts
 
   return (
-    <div className='fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm flex items-center justify-center p-4'>
+    <div className='fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm flex items-center justify-center p-0'>
       <div className='bg-white rounded-xl shadow-lg w-full max-w-2xl h-[80vh] flex flex-col overflow-hidden'>
         <div className='flex items-center p-4 border-b border-gray-200'>
           {categoryPath.length > 0 && (
diff --git a/src/features/wizard/components/steps/CategoryStep.tsx b/src/features/wizard/components/steps/CategoryStep.tsx
index b7dbf6b..ec08d88 100644
--- a/src/features/wizard/components/steps/CategoryStep.tsx
+++ b/src/features/wizard/components/steps/CategoryStep.tsx
@@ -14,38 +14,39 @@ interface CategoryStepProps {
 export const CategoryStep: React.FC<CategoryStepProps> = ({
   selection,
   onUpdate,
-  currentStep = 4,
+  currentStep = 1, // Updated to be the first step
   totalSteps = 5,
 }) => {
-  const subQuestion = `You can set a category for your statement`;
+  const subQuestion = `Select a category for your statement. This will determine available options for the subject.`;
   const categories = statementsCategories.categories || [];
-  
+
   // Helper function to normalize category IDs
   const normalizeCategoryId = (id: string): string => {
     return id ? id.toLowerCase() : '';
   };
-  
+
   // Handle all possible variations of "uncategorized"
   const normalizedSelection = normalizeCategoryId(selection);
-  const uncategorisedSelected = !selection || 
-    normalizedSelection === 'uncategorised' || 
+  const uncategorisedSelected =
+    !selection ||
+    normalizedSelection === 'uncategorised' ||
     normalizedSelection === 'uncategorized';
 
   return (
-    <StepContainer 
-      subQuestion={subQuestion} 
+    <StepContainer
+      subQuestion={subQuestion}
       showBack
       currentStep={currentStep}
       totalSteps={totalSteps}
     >
-      <div className='grid grid-cols-2 gap-3 max-h-[60vh] overflow-y-auto p-2'>
+      <div className='grid grid-cols-2 gap-2 max-h-[60vh] overflow-y-auto p-2'>
         {categories.map((cat: { id: string; name: string }) => (
           <Button
             key={cat.id}
-            onClick={() => onUpdate(cat.id)} 
+            onClick={() => onUpdate(cat.id)}
             variant={'outline'}
             selected={normalizedSelection === normalizeCategoryId(cat.id)}
-            className='h-auto py-4 px-6 text-left flex flex-col items-start transition-all whitespace-normal break-words'
+            className='h-auto p-2 sm:py-4 text-left flex flex-col items-start transition-all whitespace-normal break-words border-3 box-border'
             style={
               {
                 // Set the CSS variable to the category selector color. This is used on buttonVariants.ts
@@ -57,10 +58,10 @@ export const CategoryStep: React.FC<CategoryStepProps> = ({
           </Button>
         ))}
         <Button
-          onClick={() => onUpdate('uncategorized')} 
+          onClick={() => onUpdate('uncategorized')}
           variant={'outline'}
           selected={uncategorisedSelected}
-          className='h-auto py-4 px-6 text-left flex flex-col items-start transition-all whitespace-normal break-words'
+          className='h-auto p-2 sm:py-4 text-left flex flex-col items-start transition-all whitespace-normal break-words border-3 box-border'
           style={
             {
               // Set the CSS variable to the category selector color. This is used on buttonVariants.ts
diff --git a/src/features/wizard/components/steps/ObjectStep.tsx b/src/features/wizard/components/steps/ObjectStep.tsx
index 5c30eba..4aff0cd 100644
--- a/src/features/wizard/components/steps/ObjectStep.tsx
+++ b/src/features/wizard/components/steps/ObjectStep.tsx
@@ -18,7 +18,7 @@ export const ObjectStep: React.FC<ObjectStepProps> = ({
   verb,
   selection,
   onUpdate,
-  currentStep = 3,
+  currentStep = 4, // Updated since category, subject, and verb now come first
   totalSteps = 5,
 }) => {
   const subQuestion = `In what way does ${subject} ${getVerbName(
@@ -26,7 +26,7 @@ export const ObjectStep: React.FC<ObjectStepProps> = ({
   )}? What's the context?`;
 
   return (
-    <StepContainer 
+    <StepContainer
       subQuestion={subQuestion}
       showBack
       currentStep={currentStep}
@@ -38,7 +38,7 @@ export const ObjectStep: React.FC<ObjectStepProps> = ({
           placeholder='Type your answer...'
           value={selection}
           onChange={(e) => onUpdate(e.target.value)}
-          className='text-lg p-4 rounded'
+          className='text-lg p-4 rounded text-black'
         />
       </div>
     </StepContainer>
diff --git a/src/features/wizard/components/steps/PrivacyStep.tsx b/src/features/wizard/components/steps/PrivacyStep.tsx
index da5d5c6..c120edf 100644
--- a/src/features/wizard/components/steps/PrivacyStep.tsx
+++ b/src/features/wizard/components/steps/PrivacyStep.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import StepContainer from '../StepContainer';
 import { Button } from '@/components/ui/button';
 import { MailX, MailPlus } from 'lucide-react';
+import { useEntries } from '@/features/statements/hooks/useEntries';
 
 interface PrivacyStepProps {
   isPublic: boolean;
@@ -15,65 +16,71 @@ export const PrivacyStep: React.FC<PrivacyStepProps> = ({
   isPublic,
   onUpdate,
   isSubmitting = false,
-  currentStep = 5,
+  currentStep = 5, // Still the final step
   totalSteps = 5,
 }) => {
+  const { data } = useEntries();
+  const { managerName } = data;
   const subQuestion = 'Who can see this statement?';
 
   return (
-    <StepContainer 
-      subQuestion={subQuestion} 
+    <StepContainer
+      subQuestion={subQuestion}
       showBack
       currentStep={currentStep}
       totalSteps={totalSteps}
     >
-      <div className='space-y-6'>
-        <div className='space-y-4'>
-          <Button
-            variant='outline'
-            selected={!isPublic}
-            disabled={isSubmitting}
-            className='w-full h-auto p-4 flex items-center justify-between'
-            onClick={() => onUpdate(false)}
-            style={
-              {
-                '--tile-color': 'var(--privacy-selector)',
-              } as React.CSSProperties
-            }
-          >
-            <div className='flex items-center space-x-3'>
-              <MailX className='w-5 h-5 text-gray-500' />
-              <div className='text-left'>
-                <div className='font-medium'>Private</div>
-                <div className='text-sm text-muted-foreground'>
-                  Only you can see this
-                </div>
+      <div className='space-y-4 '>
+        <Button
+          variant='outline'
+          selected={!isPublic}
+          disabled={isSubmitting}
+          className='w-full h-auto p-2 flex items-center justify-between'
+          onClick={() => onUpdate(false)}
+          style={
+            {
+              '--tile-color': 'var(--privacy-selector)',
+            } as React.CSSProperties
+          }
+        >
+          <div className='flex items-center space-x-3'>
+            <MailX className='w-5 h-5 text-black' />
+            <div className='text-left text-black'>
+              <div className='font-medium'>Private</div>
+              <div className='text-sm'>
+                {managerName 
+                  ? `This won't be shared with ${managerName}`
+                  : "This won't be shared with your manager"
+                }
               </div>
             </div>
-          </Button>
-          <Button
-            variant='outline'
-            selected={isPublic}
-            disabled={isSubmitting}
-            className='w-full h-auto p-4 flex items-center justify-between'
-            onClick={() => onUpdate(true)}
-            style={
-              {
-                '--tile-color': 'var(--privacy-selector)',
-              } as React.CSSProperties
-            }
-          >
-            <div className='flex items-center space-x-3'>
-              <MailPlus className='w-5 h-5 text-green-500' />
-              <div className='text-left'>
-                <div className='font-medium'>Public</div>
-                <div className='text-sm text-muted-foreground'>
-                  Everyone can see this
-                </div>
+          </div>
+        </Button>
+        <Button
+          variant='outline'
+          selected={isPublic}
+          disabled={isSubmitting}
+          className='w-full h-auto p-2 flex items-center justify-between'
+          onClick={() => onUpdate(true)}
+          style={
+            {
+              '--tile-color': 'var(--privacy-selector)',
+            } as React.CSSProperties
+          }
+        >
+          <div className='flex items-center space-x-3'>
+            <MailPlus className='w-5 h-5 text-green-500' />
+            <div className='text-left text-black'>
+              <div className='font-medium'>Public</div>
+              <div className='text-sm'>
+                {managerName 
+                  ? `This will be shared with ${managerName}`
+                  : "This will be shared with your manager"
+                }
               </div>
             </div>
-          </Button>
-        </div>
+          </div>
+        </Button>
       </div>
     </StepContainer>
   );
diff --git a/src/features/wizard/components/steps/SubjectStep.tsx b/src/features/wizard/components/steps/SubjectStep.tsx
index b06cec4..0fb8c3e 100644
--- a/src/features/wizard/components/steps/SubjectStep.tsx
+++ b/src/features/wizard/components/steps/SubjectStep.tsx
@@ -7,6 +7,7 @@ interface SubjectStepProps {
   username: string;
   presetQuestion?: SetQuestion;
   selection: string;
+  selectedCategory?: string;
   onUpdate: (val: string) => void;
   currentStep?: number;
   totalSteps?: number;
@@ -16,8 +17,9 @@ export const SubjectStep: React.FC<SubjectStepProps> = ({
   username,
   presetQuestion,
   selection,
+  selectedCategory,
   onUpdate,
-  currentStep = 1,
+  currentStep = 2, // Updated step number since category is now first
   totalSteps = 5,
 }) => {
   // Use a default subject question text
@@ -41,6 +43,7 @@ export const SubjectStep: React.FC<SubjectStepProps> = ({
         <SubjectTiles
           username={username}
           activePresetQuestion={presetQuestion}
+          selectedCategory={selectedCategory}
           selectedValue={selection}
           onSelect={(value) => {
             onUpdate(value);
diff --git a/src/features/wizard/components/steps/VerbStep.tsx b/src/features/wizard/components/steps/VerbStep.tsx
index cb385c8..3977676 100644
--- a/src/features/wizard/components/steps/VerbStep.tsx
+++ b/src/features/wizard/components/steps/VerbStep.tsx
@@ -15,18 +15,18 @@ export const VerbStep: React.FC<VerbStepProps> = ({
   subject,
   selection,
   onUpdate,
-  currentStep = 2,
+  currentStep = 3, // Updated since category and subject now come first
   totalSteps = 5,
 }) => {
   const subQuestion = `What's happening with ${subject}? How do they feel or what do they experience?`;
 
   return (
-    <StepContainer 
+    <StepContainer
       subQuestion={subQuestion}
       currentStep={currentStep}
       totalSteps={totalSteps}
     >
-      <div className='flex flex-col h-[60vh] p-4 rounded-md'>
+      <div className='flex flex-col p-2 md:p-4 rounded-md mt-0'>
         <SentimentVerbPicker
           selectedVerbId={selection}
           onVerbSelect={(verb: Verb) => {
diff --git a/src/index.css b/src/index.css
index 00e759a..aa25542 100644
--- a/src/index.css
+++ b/src/index.css
@@ -56,8 +56,8 @@
     --verb-selector-hover: #a0d8f1;
     --object-input: #bfdbfe;
     --object-input-hover: #aecbf0;
-    --privacy-selector: #f0a3d3;
-    --privacy-selector-hover: #e68fc0;
+    --privacy-selector: #aa2f4a;
+    --privacy-selector-hover: #8b243b;
     --category-selector: #ffc394;
     --category-selector-hover: #ffb57a;
     --complement: 'gray-400';
@@ -99,6 +99,34 @@
     @apply border-border;
   }
   body {
-    @apply bg-background text-foreground font-sans;
+    @apply bg-background text-foreground font-sans bg-gray-50;
   }
 }
+
+/* Custom transition class for height animation */
+.transition-height {
+  transition-property: height;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+/* Help Button Pulse Animation */
+@keyframes help-button-pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(37, 99, 235, 0.7);
+    transform: scale(1);
+  }
+  
+  70% {
+    box-shadow: 0 0 0 10px rgba(37, 99, 235, 0);
+    transform: scale(1.05);
+  }
+  
+  100% {
+    box-shadow: 0 0 0 0 rgba(37, 99, 235, 0);
+    transform: scale(1);
+  }
+}
+
+.help-button-pulse {
+  animation: help-button-pulse 1.5s infinite;
+}
diff --git a/src/layouts/components/Footer.tsx b/src/layouts/components/Footer.tsx
new file mode 100644
index 0000000..b83dcab
--- /dev/null
+++ b/src/layouts/components/Footer.tsx
@@ -0,0 +1,46 @@
+'use client';
+
+import React, { useState } from 'react';
+import PrivacyModal from '../../components/modals/PrivacyModal';
+import TermsModal from '../../components/modals/TermsModal';
+
+const Footer: React.FC = () => {
+  const [isPrivacyModalOpen, setIsPrivacyModalOpen] = useState(false);
+  const [isTermsModalOpen, setIsTermsModalOpen] = useState(false);
+
+  return (
+    <>
+      <footer className='mt-auto pt-6 pb-4 bg-gray-50 border-t border-gray-200'>
+        <div className='container mx-auto px-4'>
+          <div className='flex flex-col sm:flex-row justify-center items-center text-xs text-gray-500 space-y-2 sm:space-y-0 sm:space-x-4'>
+            <button
+              onClick={() => setIsPrivacyModalOpen(true)}
+              className='hover:text-brand-pink hover:underline'
+            >
+              Privacy Policy
+            </button>
+            <button
+              onClick={() => setIsTermsModalOpen(true)}
+              className='hover:text-brand-pink hover:underline'
+            >
+              Terms of Use
+            </button>
+            <span>© {new Date().getFullYear()} Beacons</span>
+          </div>
+        </div>
+      </footer>
+
+      {/* Conditionally render the privacy modal */}
+      {isPrivacyModalOpen && (
+        <PrivacyModal onClose={() => setIsPrivacyModalOpen(false)} />
+      )}
+
+      {/* Conditionally render the terms modal */}
+      {isTermsModalOpen && (
+        <TermsModal onClose={() => setIsTermsModalOpen(false)} />
+      )}
+    </>
+  );
+};
+
+export default Footer;
\ No newline at end of file
diff --git a/src/layouts/components/Header.tsx b/src/layouts/components/Header.tsx
index 437934f..5735ec0 100644
--- a/src/layouts/components/Header.tsx
+++ b/src/layouts/components/Header.tsx
@@ -19,24 +19,20 @@ const Header: React.FC = () => {
   };
 
   return (
-    <header className='bg-brand-pink text-white p-4 shadow-md sticky top-0 z-50'>
-      <div className='container mx-auto'>
+    <header className='bg-brand-pink text-white py-3 px-2 sm:p-4 shadow-md sticky top-0 z-50'>
+      <div className='px-1 sm:px-4 md:container md:mx-auto'>
         {/* Simplified header layout */}
-        <div className='flex flex-wrap items-center justify-between'>
-          {/* Left section: Logo */}
+        <div className='flex items-center justify-between'>
+          {/* Left section: Logo and Title */}
           <div className='flex items-center'>
             <img src='/lift_logo.png' alt='Logo' className='h-8 sm:h-10 mr-2' />
+            <h1 className='text-3xl md:text-4xl font-bold'>Beacons</h1>
           </div>
 
-          {/* Center section: Title */}
-          <h1 className='text-xl sm:text-2xl font-bold order-last w-full sm:order-none sm:w-auto text-center my-2 sm:my-0'>
-            Beacons
-          </h1>
-
-          {/* Right section: Login button - ALWAYS VISIBLE */}
+          {/* Right section: Login button and Tour button */}
           <div className='flex items-center relative'>
             {data.username ? (
-              <div>
+              <div className='flex items-center'>
                 <button
                   onClick={openModal}
                   className='flex items-center border-2 border-white rounded-full px-2 py-1 sm:px-4 sm:py-2 cursor-pointer hover:bg-pink-600 transition-colors'
diff --git a/src/layouts/components/MainPage.tsx b/src/layouts/components/MainPage.tsx
index 6faa9a4..d054ef7 100644
--- a/src/layouts/components/MainPage.tsx
+++ b/src/layouts/components/MainPage.tsx
@@ -12,17 +12,15 @@ import { Button } from '../../components/ui/button';
 import { Mail } from 'lucide-react';
 import StatementWizard from '../../features/wizard/components/StatementWizard';
 import ShareEmailModal from '../../components/modals/ShareEmailModal';
-import PrivacyModal from '../../components/modals/PrivacyModal';
-import TermsModal from '../../components/modals/TermsModal';
-import TestStatementButton from '../../components/debug/TestButton';
+// import TestStatementButton from '../../components/debug/TestButton';
+import Footer from './Footer';
 
 const MainPage: React.FC = () => {
   const { data } = useEntries();
   const { username, managerName, managerEmail, entries } = data;
   const [isWizardOpen, setIsWizardOpen] = useState(false);
   const [isShareModalOpen, setIsShareModalOpen] = useState(false);
-  const [isPrivacyModalOpen, setIsPrivacyModalOpen] = useState(false);
-  const [isTermsModalOpen, setIsTermsModalOpen] = useState(false);
+
 
   // Determine if email button should be disabled:
   const hasManagerEmail = managerEmail && managerEmail.trim().length > 0;
@@ -34,22 +32,20 @@ const MainPage: React.FC = () => {
   // Email button should be disabled if no manager email or no public statements
   const isEmailDisabled = !hasManagerEmail || publicStatementsCount === 0;
 
-  // Handler to open the wizard for creating a new statement from scratch
-  const handleNewStatement = () => {
-    setIsWizardOpen(true);
-  };
-
   // Handler to open the share email modal
   const handleShareEmail = () => {
     setIsShareModalOpen(true);
   };
 
   return (
-    <main className='min-h-screen bg-gradient-to-b from-gray-50 to-gray-100 py-12 flex flex-col'>
-      <div className='container mx-auto px-4 mb-6'>
+    <main className='min-h-screen bg-gradient-to-b from-gray-50 to-gray-100 py-4 md:py-8 flex flex-col'>
+      <div className='container mx-auto px-4 mb-0'>
         {/* Fixed header layout with 1 or 2 rows */}
         <div className='flex flex-col md:flex-row md:justify-between md:items-center'>
-          <h1 className='text-2xl md:text-3xl font-bold mb-3 md:mb-0 truncate'>
+          <h1
+            id='page-title'
+            className='text-2xl md:text-3xl font-bold mb-3 md:mb-0 truncate'
+          >
             {managerName
               ? `${username} would like to share with ${managerName}`
               : `${username}'s statements for sharing`}
@@ -60,32 +56,14 @@ const MainPage: React.FC = () => {
       <div className='container mx-auto px-4 flex-grow'>
         <StatementList
           username={username}
-          onAddCustomStatement={handleNewStatement}
+          // onAddCustomStatement={handleNewStatement}
         />
       </div>
 
-      {/* Footer with privacy links */}
-      <footer className='mt-auto pt-6 pb-4 bg-gray-50 border-t border-gray-200'>
-        <div className='container mx-auto px-4'>
-          <div className='flex flex-col sm:flex-row justify-center items-center text-xs text-gray-500 space-y-2 sm:space-y-0 sm:space-x-4'>
-            <button
-              onClick={() => setIsPrivacyModalOpen(true)}
-              className='hover:text-brand-pink hover:underline'
-            >
-              Privacy Policy
-            </button>
-            <button
-              onClick={() => setIsTermsModalOpen(true)}
-              className='hover:text-brand-pink hover:underline'
-            >
-              Terms of Use
-            </button>
-            <span>© {new Date().getFullYear()} Beacons</span>
-          </div>
-        </div>
-      </footer>
+      {/* Footer component */}
+      <Footer />
 
-      {/* Floating Email Button (now singular) */}
+      {/* Floating Email Button */}
       <div className='fixed bottom-8 right-8 z-30'>
         {/* Email Button: Disabled if there's no manager email or no public statements */}
         <Tooltip>
@@ -115,9 +93,9 @@ const MainPage: React.FC = () => {
         </Tooltip>
 
         {/* Debug button */}
-        <div className='mt-2'>
+        {/* <div className='mt-2'>
           <TestStatementButton />
-        </div>
+        </div> */}
       </div>
 
       {/* Conditionally render the wizard modal */}
@@ -133,16 +111,6 @@ const MainPage: React.FC = () => {
       {isShareModalOpen && (
         <ShareEmailModal onClose={() => setIsShareModalOpen(false)} />
       )}
-
-      {/* Conditionally render the privacy modal */}
-      {isPrivacyModalOpen && (
-        <PrivacyModal onClose={() => setIsPrivacyModalOpen(false)} />
-      )}
-
-      {/* Conditionally render the terms modal */}
-      {isTermsModalOpen && (
-        <TermsModal onClose={() => setIsTermsModalOpen(false)} />
-      )}
     </main>
   );
 };
diff --git a/src/types/entries.ts b/src/types/entries.ts
index aeff3bc..ca8ddea 100644
--- a/src/types/entries.ts
+++ b/src/types/entries.ts
@@ -11,9 +11,11 @@ export interface Action {
   byDate: string;
   action: string;
   completed: boolean;
-  gratitudeSent?: boolean;
-  gratitudeMessage?: string;
-  gratitudeSentDate?: string;
+  gratitude?: {
+    sent?: boolean;
+    message?: string;
+    sentDate?: string;
+  };
 }
 
 export interface Entry {
@@ -24,7 +26,7 @@ export interface Entry {
   actions?: Action[];
   category: string;
   presetId?: string;
-  isResolved?: boolean;
+  isArchived?: boolean;
   _needsScroll?: boolean; // Flag to indicate if this entry needs to be scrolled into view
   _updateTimestamp?: number; // Optional timestamp for tracking updates
 }
@@ -44,7 +46,7 @@ export interface Verb {
   popularity: number;
   categories: string[];
   color: string;
-  presentTenseForm?: string;  // Optional field for verbs that need explicit present tense form
+  presentTenseForm?: string; // Optional field for verbs that need explicit present tense form
 }
 
 export interface SubjectData {
@@ -58,7 +60,6 @@ export interface SetQuestionStep {
   presetAnswer: string | null;
   allowDescriptors?: boolean;
   descriptorCategory?: string;
-  allowedVerbs?: string[];
 }
 
 export interface SetQuestion {
diff --git a/tailwind.config.js b/tailwind.config.js
index 6c7a6f4..2913773 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -15,8 +15,8 @@ export default {
       },
     },
     screens: {
-      xs: '480px',
-      sm: '480px',
+      xs: '580px',
+      sm: '640px',
       md: '768px',
       lg: '1024px',
       xl: '1280px',
@@ -91,6 +91,14 @@ export default {
         md: 'calc(var(--radius) - 2px)',
         sm: 'calc(var(--radius) - 4px)',
       },
+      borderWidth: {
+        DEFAULT: '1px',
+        '0': '0',
+        '2': '2px',
+        '3': '3px',
+        '4': '4px',
+        '8': '8px',
+      },
       spacing: {
         'wizard-padding': '1.5rem',
       },