diff --git a/client/src/App.tsx b/client/src/App.tsx
index f963da2..c82b294 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -4,6 +4,7 @@ import { useTaskData } from './hooks/useTaskData'
 import { DesktopLayout } from './layouts/DesktopLayout'
 import { MobileLayout } from './layouts/MobileLayout'
 import { StepDetails } from './components/StepDetails'
+import type { GroupWithTasks, TaskWithSteps, StepWithNotes } from './types'
 
 const theme = createTheme()
 
@@ -20,6 +21,7 @@ export function App() {
     setSelectedTask,
     setSelectedStep,
     handlePrintStep,
+    handlePrintTask,
     handleAddNote,
   } = useTaskData()
 
@@ -46,13 +48,16 @@ export function App() {
       <CssBaseline />
       {deviceType === 'desktop' ? (
         <DesktopLayout
-          groups={groups as any}
-          selectedGroup={selectedGroup as any}
-          selectedTask={selectedTask as any}
-          selectedStep={selectedStep as any}
-          onGroupSelect={setSelectedGroup as any}
-          onTaskSelect={setSelectedTask as any}
-          onStepSelect={setSelectedStep as any}
+          groups={groups}
+          selectedGroup={selectedGroup}
+          selectedTask={selectedTask}
+          selectedStep={selectedStep}
+          onGroupSelect={setSelectedGroup}
+          onTaskSelect={setSelectedTask}
+          onStepSelect={setSelectedStep}
+          onPrintTask={handlePrintTask}
+          onPrintStep={handlePrintStep}
+          onAddNote={handleAddNote}
         />
       ) : (
         <>
@@ -65,13 +70,13 @@ export function App() {
             />
           ) : (
             <MobileLayout
-              groups={groups as any}
-              selectedGroup={selectedGroup as any}
-              selectedTask={selectedTask as any}
-              selectedStep={selectedStep as any}
-              onGroupSelect={setSelectedGroup as any}
-              onTaskSelect={setSelectedTask as any}
-              onStepSelect={setSelectedStep as any}
+              groups={groups}
+              selectedGroup={selectedGroup}
+              selectedTask={selectedTask}
+              selectedStep={selectedStep}
+              onGroupSelect={setSelectedGroup}
+              onTaskSelect={setSelectedTask}
+              onStepSelect={setSelectedStep}
               onBack={handleBack}
             />
           )}
diff --git a/client/src/components/StepDetails.tsx b/client/src/components/StepDetails.tsx
index 4e9dc33..afdbbcf 100644
--- a/client/src/components/StepDetails.tsx
+++ b/client/src/components/StepDetails.tsx
@@ -1,5 +1,6 @@
 import { Box, Typography, Button, TextField, IconButton } from '@mui/material';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import PrintIcon from '@mui/icons-material/Print';
 import type { StepWithNotes } from '../types';
 
 interface StepDetailsProps {
@@ -16,13 +17,18 @@ export function StepDetails({ step, onPrint, onAddNote, onBack }: StepDetailsPro
         <IconButton onClick={onBack} sx={{ mr: 1 }}>
           <ArrowBackIcon />
         </IconButton>
-        <Typography variant="h6">{step.name}</Typography>
+        <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, flex: 1 }}>
+          <Typography variant="h6">{step.name}</Typography>
+        </Box>
+        <IconButton onClick={onPrint}>
+          <PrintIcon />
+        </IconButton>
       </Box>
       <Typography sx={{ mb: 4 }}>{step.instructions}</Typography>
 
       <Box sx={{ mb: 4 }}>
         <Typography variant="h6" sx={{ mb: 2 }}>
-          Notes
+          Notes ({step.notes.length})
         </Typography>
         {step.notes.map((note) => (
           <Box key={note.id} sx={{ mb: 2 }}>
@@ -44,10 +50,6 @@ export function StepDetails({ step, onPrint, onAddNote, onBack }: StepDetailsPro
           Add Note
         </Button>
       </Box>
-
-      <Button variant="contained" onClick={onPrint}>
-        Print Step
-      </Button>
     </Box>
   );
 }
\ No newline at end of file
diff --git a/client/src/graphql/mutations.ts b/client/src/graphql/mutations.ts
index b30b96d..43ad416 100644
--- a/client/src/graphql/mutations.ts
+++ b/client/src/graphql/mutations.ts
@@ -63,9 +63,12 @@ export const CREATE_NOTE = gql`
       id
       content
       step_id
-      user_id
       created_at
       updated_at
+      user {
+        id
+        name
+      }
     }
   }
 `;
\ No newline at end of file
diff --git a/client/src/hooks/useTaskData.ts b/client/src/hooks/useTaskData.ts
index e27feb4..9ee1deb 100644
--- a/client/src/hooks/useTaskData.ts
+++ b/client/src/hooks/useTaskData.ts
@@ -156,9 +156,9 @@ export function useTaskData() {
     }
   };
 
-  const handleAddNote = async (content: string, userId: string) => {
-    if (!selectedStep?.id || !userId) {
-      console.error('Cannot add note: missing stepId or userId');
+  const handleAddNote = async (content: string) => {
+    if (!selectedStep?.id) {
+      console.error('Cannot add note: missing stepId');
       return;
     }
 
@@ -166,10 +166,10 @@ export function useTaskData() {
       await createNote({
         variables: {
           content,
-          stepId: selectedStep.id,
-          userId,
+          stepId: String(selectedStep.id),
         },
       });
+      await refetchStep({ id: String(selectedStep.id) });
     } catch (error) {
       console.error('Error adding note:', error);
     }
diff --git a/client/src/layouts/DesktopLayout.tsx b/client/src/layouts/DesktopLayout.tsx
index bf0bbcb..61e1f0b 100644
--- a/client/src/layouts/DesktopLayout.tsx
+++ b/client/src/layouts/DesktopLayout.tsx
@@ -1,4 +1,5 @@
-import { Box, Typography } from '@mui/material';
+import { Box, Typography, IconButton, TextField, Button } from '@mui/material';
+import PrintIcon from '@mui/icons-material/Print';
 import type { GroupWithTasks, TaskWithSteps, StepWithNotes } from '../types';
 import { CreateButtons } from '../components/CreateButtons';
 
@@ -10,6 +11,9 @@ interface DesktopLayoutProps {
   onGroupSelect: (group: GroupWithTasks | undefined) => void;
   onTaskSelect: (task: TaskWithSteps | undefined) => void;
   onStepSelect: (step: StepWithNotes | undefined) => void;
+  onPrintTask?: (taskId: string, userId: string) => void;
+  onPrintStep?: (stepId: string, userId: string) => void;
+  onAddNote?: (content: string) => void;
 }
 
 export function DesktopLayout({
@@ -20,6 +24,9 @@ export function DesktopLayout({
   onGroupSelect,
   onTaskSelect,
   onStepSelect,
+  onPrintTask,
+  onPrintStep,
+  onAddNote,
 }: DesktopLayoutProps) {
   return (
     <Box sx={{ display: 'flex', height: '100vh' }}>
@@ -62,10 +69,25 @@ export function DesktopLayout({
                 cursor: 'pointer',
                 bgcolor: selectedTask?.id === task.id ? 'action.selected' : 'transparent',
                 '&:hover': { bgcolor: 'action.hover' },
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center',
               }}
-              onClick={() => onTaskSelect(task)}
             >
-              <Typography>{task.name}</Typography>
+              <Box onClick={() => onTaskSelect(task)} sx={{ flex: 1 }}>
+                <Typography>{task.name}</Typography>
+              </Box>
+              {onPrintTask && (
+                <IconButton
+                  size="small"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onPrintTask(String(task.id), '1'); // TODO: Get real user ID
+                  }}
+                >
+                  <PrintIcon />
+                </IconButton>
+              )}
             </Box>
           ))}
         </Box>
@@ -86,10 +108,25 @@ export function DesktopLayout({
                 cursor: 'pointer',
                 bgcolor: selectedStep?.id === step.id ? 'action.selected' : 'transparent',
                 '&:hover': { bgcolor: 'action.hover' },
+                display: 'flex',
+                justifyContent: 'space-between',
+                alignItems: 'center',
               }}
-              onClick={() => onStepSelect(step)}
             >
-              <Typography>{step.name}</Typography>
+              <Box onClick={() => onStepSelect(step)} sx={{ flex: 1 }}>
+                <Typography>{step.name}</Typography>
+              </Box>
+              {onPrintStep && (
+                <IconButton
+                  size="small"
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onPrintStep(String(step.id), '1'); // TODO: Get real user ID
+                  }}
+                >
+                  <PrintIcon />
+                </IconButton>
+              )}
             </Box>
           ))}
         </Box>
@@ -97,11 +134,45 @@ export function DesktopLayout({
 
       {/* Step details panel */}
       {selectedStep && (
-        <Box sx={{ flex: 1, p: 2 }}>
-          <Typography variant="h6" sx={{ mb: 2 }}>
-            {selectedStep.name}
-          </Typography>
-          <Typography>{selectedStep.instructions}</Typography>
+        <Box sx={{ flex: 1, p: 2, overflow: 'auto' }}>
+          <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', mb: 2 }}>
+            <Typography variant="h6">{selectedStep.name}</Typography>
+            {onPrintStep && (
+              <IconButton
+                onClick={() => onPrintStep(String(selectedStep.id), '1')} // TODO: Get real user ID
+              >
+                <PrintIcon />
+              </IconButton>
+            )}
+          </Box>
+          <Typography sx={{ mb: 4 }}>{selectedStep.instructions}</Typography>
+
+          <Box sx={{ mb: 4 }}>
+            <Typography variant="h6" sx={{ mb: 2 }}>
+              Notes ({selectedStep.notes.length})
+            </Typography>
+            {selectedStep.notes.map((note) => (
+              <Box key={note.id} sx={{ mb: 2 }}>
+                <Typography variant="subtitle2">{note.user?.name}</Typography>
+                <Typography>{note.content}</Typography>
+              </Box>
+            ))}
+          </Box>
+
+          <Box sx={{ mb: 4 }}>
+            <TextField
+              fullWidth
+              multiline
+              rows={4}
+              placeholder="Add a note..."
+              sx={{ mb: 2 }}
+            />
+            {onAddNote && (
+              <Button variant="contained" onClick={() => onAddNote('New note')}>
+                Add Note
+              </Button>
+            )}
+          </Box>
         </Box>
       )}
     </Box>