diff --git a/src/components/participants/ParticipantForm.tsx b/src/components/participants/ParticipantForm.tsx
index 7616131..492ddd6 100755
--- a/src/components/participants/ParticipantForm.tsx
+++ b/src/components/participants/ParticipantForm.tsx
@@ -256,160 +256,148 @@ export function ParticipantForm({
     <>
       <FormSection
         title="Participant Information"
-        description="Basic information about the research participant."
+        description="Basic identity and study association."
       >
-        <FormField>
-          <Label htmlFor="participantCode">Participant Code *</Label>
-          <Input
-            id="participantCode"
-            {...form.register("participantCode")}
-            placeholder="e.g., P001, SUBJ_01, etc."
-            className={
-              form.formState.errors.participantCode ? "border-red-500" : ""
-            }
-          />
-          {form.formState.errors.participantCode && (
-            <p className="text-sm text-red-600">
-              {form.formState.errors.participantCode.message}
-            </p>
-          )}
-          <p className="text-muted-foreground text-xs">
-            Unique identifier for this participant within the study
-          </p>
-        </FormField>
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+          <FormField>
+            <Label htmlFor="participantCode">Participant Code *</Label>
+            <Input
+              id="participantCode"
+              {...form.register("participantCode")}
+              placeholder="e.g., P001"
+              className={
+                form.formState.errors.participantCode ? "border-red-500" : ""
+              }
+            />
+            {form.formState.errors.participantCode && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.participantCode.message}
+              </p>
+            )}
+          </FormField>
 
-        <FormField>
-          <Label htmlFor="name">Full Name</Label>
-          <Input
-            id="name"
-            {...form.register("name")}
-            placeholder="Optional: Participant's full name"
-            className={form.formState.errors.name ? "border-red-500" : ""}
-          />
-          {form.formState.errors.name && (
-            <p className="text-sm text-red-600">
-              {form.formState.errors.name.message}
-            </p>
-          )}
-          <p className="text-muted-foreground text-xs">
-            Optional: Real name for contact purposes
-          </p>
-        </FormField>
+          <FormField>
+            <Label htmlFor="name">Full Name</Label>
+            <Input
+              id="name"
+              {...form.register("name")}
+              placeholder="Optional name"
+              className={form.formState.errors.name ? "border-red-500" : ""}
+            />
+            {form.formState.errors.name && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.name.message}
+              </p>
+            )}
+          </FormField>
 
-        <FormField>
-          <Label htmlFor="email">Email Address</Label>
-          <Input
-            id="email"
-            type="email"
-            {...form.register("email")}
-            placeholder="participant@example.com"
-            className={form.formState.errors.email ? "border-red-500" : ""}
-          />
-          {form.formState.errors.email && (
-            <p className="text-sm text-red-600">
-              {form.formState.errors.email.message}
-            </p>
-          )}
-          <p className="text-muted-foreground text-xs">
-            Optional: For scheduling and communication
-          </p>
-        </FormField>
-
-        <FormField>
-          <Label htmlFor="studyId">Study *</Label>
-          <Select
-            value={form.watch("studyId")}
-            onValueChange={(value) => form.setValue("studyId", value)}
-            disabled={studiesLoading || mode === "edit"}
-          >
-            <SelectTrigger
-              className={form.formState.errors.studyId ? "border-red-500" : ""}
-            >
-              <SelectValue
-                placeholder={
-                  studiesLoading ? "Loading studies..." : "Select a study"
-                }
-              />
-            </SelectTrigger>
-            <SelectContent>
-              {studiesData?.studies?.map((study) => (
-                <SelectItem key={study.id} value={study.id}>
-                  {study.name}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          {form.formState.errors.studyId && (
-            <p className="text-sm text-red-600">
-              {form.formState.errors.studyId.message}
-            </p>
-          )}
-          {mode === "edit" && (
-            <p className="text-muted-foreground text-xs">
-              Study cannot be changed after registration
-            </p>
-          )}
-        </FormField>
+          <FormField>
+            <Label htmlFor="email">Email Address</Label>
+            <Input
+              id="email"
+              type="email"
+              {...form.register("email")}
+              placeholder="participant@example.com"
+              className={form.formState.errors.email ? "border-red-500" : ""}
+            />
+            {form.formState.errors.email && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.email.message}
+              </p>
+            )}
+          </FormField>
+        </div>
       </FormSection>
 
-      <FormSection
-        title="Demographics"
-        description="Optional demographic information for research purposes."
-      >
-        <FormField>
-          <Label htmlFor="age">Age</Label>
-          <Input
-            id="age"
-            type="number"
-            min="18"
-            max="120"
-            {...form.register("age", { valueAsNumber: true })}
-            placeholder="e.g., 25"
-            className={form.formState.errors.age ? "border-red-500" : ""}
-          />
-          {form.formState.errors.age && (
-            <p className="text-sm text-red-600">
-              {form.formState.errors.age.message}
-            </p>
-          )}
-          <p className="text-muted-foreground text-xs">
-            Optional: Age in years (minimum 18)
-          </p>
-        </FormField>
+      <div className="my-6" />
 
-        <FormField>
-          <Label htmlFor="gender">Gender</Label>
-          <Select
-            value={form.watch("gender") ?? ""}
-            onValueChange={(value) =>
-              form.setValue(
-                "gender",
-                value as
-                | "male"
-                | "female"
-                | "non_binary"
-                | "prefer_not_to_say"
-                | "other",
-              )
-            }
-          >
-            <SelectTrigger>
-              <SelectValue placeholder="Select gender (optional)" />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="male">Male</SelectItem>
-              <SelectItem value="female">Female</SelectItem>
-              <SelectItem value="non_binary">Non-binary</SelectItem>
-              <SelectItem value="prefer_not_to_say">
-                Prefer not to say
-              </SelectItem>
-              <SelectItem value="other">Other</SelectItem>
-            </SelectContent>
-          </Select>
-          <p className="text-muted-foreground text-xs">
-            Optional: Gender identity for demographic analysis
-          </p>
-        </FormField>
+      <FormSection
+        title="Demographics & Study"
+        description="study association and demographic details."
+      >
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+          <FormField>
+            <Label htmlFor="studyId">Study *</Label>
+            <Select
+              value={form.watch("studyId")}
+              onValueChange={(value) => form.setValue("studyId", value)}
+              disabled={studiesLoading || mode === "edit"}
+            >
+              <SelectTrigger
+                className={
+                  form.formState.errors.studyId ? "border-red-500" : ""
+                }
+              >
+                <SelectValue
+                  placeholder={
+                    studiesLoading ? "Loading..." : "Select study"
+                  }
+                />
+              </SelectTrigger>
+              <SelectContent>
+                {studiesData?.studies?.map((study) => (
+                  <SelectItem key={study.id} value={study.id}>
+                    {study.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            {form.formState.errors.studyId && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.studyId.message}
+              </p>
+            )}
+          </FormField>
+
+          <FormField>
+            <Label htmlFor="age">Age</Label>
+            <Input
+              id="age"
+              type="number"
+              min="18"
+              max="120"
+              {...form.register("age", { valueAsNumber: true })}
+              placeholder="e.g., 25"
+              className={form.formState.errors.age ? "border-red-500" : ""}
+            />
+            {form.formState.errors.age && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.age.message}
+              </p>
+            )}
+          </FormField>
+
+          <FormField>
+            <Label htmlFor="gender">Gender</Label>
+            <Select
+              value={form.watch("gender") ?? ""}
+              onValueChange={(value) =>
+                form.setValue(
+                  "gender",
+                  value as
+                  | "male"
+                  | "female"
+                  | "non_binary"
+                  | "prefer_not_to_say"
+                  | "other",
+                )
+              }
+            >
+              <SelectTrigger>
+                <SelectValue placeholder="Select gender" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="male">Male</SelectItem>
+                <SelectItem value="female">Female</SelectItem>
+                <SelectItem value="non_binary">Non-binary</SelectItem>
+                <SelectItem value="prefer_not_to_say">
+                  Prefer not to say
+                </SelectItem>
+                <SelectItem value="other">Other</SelectItem>
+              </SelectContent>
+            </Select>
+          </FormField>
+        </div>
       </FormSection>
 
       {mode === "create" && (
@@ -505,8 +493,7 @@ export function ParticipantForm({
       error={error}
       onDelete={mode === "edit" ? onDelete : undefined}
       isDeleting={isDeleting}
-
-      // sidebar={sidebar} // Removed for cleaner UI per user request
+      sidebar={mode === "create" ? sidebar : undefined}
       submitText={mode === "create" ? "Register Participant" : "Save Changes"}
     >
       {formFields}
diff --git a/src/components/participants/ParticipantsTable.tsx b/src/components/participants/ParticipantsTable.tsx
index 973b213..46f2f40 100755
--- a/src/components/participants/ParticipantsTable.tsx
+++ b/src/components/participants/ParticipantsTable.tsx
@@ -24,6 +24,12 @@ import {
 } from "~/components/ui/dropdown-menu";
 import { useStudyContext } from "~/lib/study-context";
 import { api } from "~/trpc/react";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "~/components/ui/tooltip";
 
 export type Participant = {
   id: string;
@@ -101,16 +107,32 @@ export const columns: ColumnDef<Participant>[] = [
       const name = row.getValue("name");
       const email = row.original.email;
       return (
-        <div>
-          <div className="truncate font-medium">
-            {String(name) || "No name provided"}
-          </div>
-          {email && (
-            <div className="text-muted-foreground truncate text-sm">
-              {email}
+        <TooltipProvider>
+          <div>
+            <div className="truncate font-medium max-w-[200px]">
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <span>{String(name) || "No name provided"}</span>
+                </TooltipTrigger>
+                <TooltipContent>
+                  <p>{String(name) || "No name provided"}</p>
+                </TooltipContent>
+              </Tooltip>
             </div>
-          )}
-        </div>
+            {email && (
+              <div className="text-muted-foreground truncate text-sm max-w-[200px]">
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <span>{email}</span>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <p>{email}</p>
+                  </TooltipContent>
+                </Tooltip>
+              </div>
+            )}
+          </div>
+        </TooltipProvider>
       );
     },
   },
@@ -120,11 +142,30 @@ export const columns: ColumnDef<Participant>[] = [
     cell: ({ row }) => {
       const consentGiven = row.getValue("consentGiven");
 
-      if (consentGiven) {
-        return <Badge className="bg-green-100 text-green-800">Consented</Badge>;
-      }
-
-      return <Badge className="bg-red-100 text-red-800">Pending</Badge>;
+      return (
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger>
+              {consentGiven ? (
+                <Badge className="bg-green-100 text-green-800 hover:bg-green-200">
+                  Consented
+                </Badge>
+              ) : (
+                <Badge className="bg-red-100 text-red-800 hover:bg-red-200">
+                  Pending
+                </Badge>
+              )}
+            </TooltipTrigger>
+            <TooltipContent>
+              <p>
+                {consentGiven
+                  ? "Participant has signed the consent form."
+                  : "Consent form has not been recorded."}
+              </p>
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      );
     },
   },
   {
diff --git a/src/components/studies/StudyForm.tsx b/src/components/studies/StudyForm.tsx
index 77ea81c..6caec78 100755
--- a/src/components/studies/StudyForm.tsx
+++ b/src/components/studies/StudyForm.tsx
@@ -14,6 +14,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
+import { Separator } from "~/components/ui/separator";
 import { Textarea } from "~/components/ui/textarea";
 import {
   EntityForm,
@@ -165,103 +166,124 @@ export function StudyForm({ mode, studyId }: StudyFormProps) {
 
   // Form fields
   const formFields = (
-    <FormSection
-      title="Study Details"
-      description="Basic information about your research study."
-    >
-      <FormField>
-        <Label htmlFor="tour-study-name">Study Name *</Label>
-        <Input
-          id="tour-study-name"
-          {...form.register("name")}
-          placeholder="Enter study name..."
-          className={form.formState.errors.name ? "border-red-500" : ""}
-        />
-        {form.formState.errors.name && (
-          <p className="text-sm text-red-600">
-            {form.formState.errors.name.message}
-          </p>
-        )}
-      </FormField>
+    <div className="space-y-6">
+      <FormSection
+        title="Study Details"
+        description="Basic information and status of your research study."
+      >
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+          <FormField>
+            <Label htmlFor="tour-study-name">Study Name *</Label>
+            <Input
+              id="tour-study-name"
+              {...form.register("name")}
+              placeholder="Enter study name..."
+              className={form.formState.errors.name ? "border-red-500" : ""}
+            />
+            {form.formState.errors.name && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.name.message}
+              </p>
+            )}
+          </FormField>
 
-      <FormField>
-        <Label htmlFor="tour-study-description">Description *</Label>
-        <Textarea
-          id="tour-study-description"
-          {...form.register("description")}
-          placeholder="Describe the research objectives, methodology, and expected outcomes..."
-          rows={4}
-          className={form.formState.errors.description ? "border-red-500" : ""}
-        />
-        {form.formState.errors.description && (
-          <p className="text-sm text-red-600">
-            {form.formState.errors.description.message}
-          </p>
-        )}
-      </FormField>
+          <FormField>
+            <Label htmlFor="status">Status</Label>
+            <Select
+              value={form.watch("status")}
+              onValueChange={(value) =>
+                form.setValue(
+                  "status",
+                  value as "draft" | "active" | "completed" | "archived",
+                )
+              }
+            >
+              <SelectTrigger>
+                <SelectValue placeholder="Select status" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="draft">Draft - Study in preparation</SelectItem>
+                <SelectItem value="active">
+                  Active - Currently recruiting/running
+                </SelectItem>
+                <SelectItem value="completed">
+                  Completed - Data collection finished
+                </SelectItem>
+                <SelectItem value="archived">
+                  Archived - Study concluded
+                </SelectItem>
+              </SelectContent>
+            </Select>
+          </FormField>
 
-      <FormField>
-        <Label htmlFor="institution">Institution *</Label>
-        <Input
-          id="institution"
-          {...form.register("institution")}
-          placeholder="e.g., University of Technology"
-          className={form.formState.errors.institution ? "border-red-500" : ""}
-        />
-        {form.formState.errors.institution && (
-          <p className="text-sm text-red-600">
-            {form.formState.errors.institution.message}
-          </p>
-        )}
-      </FormField>
+          <div className="md:col-span-2">
+            <FormField>
+              <Label htmlFor="tour-study-description">Description *</Label>
+              <Textarea
+                id="tour-study-description"
+                {...form.register("description")}
+                placeholder="Describe the research objectives, methodology, and expected outcomes..."
+                rows={4}
+                className={
+                  form.formState.errors.description ? "border-red-500" : ""
+                }
+              />
+              {form.formState.errors.description && (
+                <p className="text-sm text-red-600">
+                  {form.formState.errors.description.message}
+                </p>
+              )}
+            </FormField>
+          </div>
+        </div>
+      </FormSection>
 
-      <FormField>
-        <Label htmlFor="irbProtocolNumber">IRB Protocol Number</Label>
-        <Input
-          id="irbProtocolNumber"
-          {...form.register("irbProtocolNumber")}
-          placeholder="e.g., IRB-2024-001"
-          className={
-            form.formState.errors.irbProtocolNumber ? "border-red-500" : ""
-          }
-        />
-        {form.formState.errors.irbProtocolNumber && (
-          <p className="text-sm text-red-600">
-            {form.formState.errors.irbProtocolNumber.message}
-          </p>
-        )}
-        <p className="text-muted-foreground text-xs">
-          Optional: Institutional Review Board protocol number if applicable
-        </p>
-      </FormField>
+      <Separator />
 
-      <FormField>
-        <Label htmlFor="status">Status</Label>
-        <Select
-          value={form.watch("status")}
-          onValueChange={(value) =>
-            form.setValue(
-              "status",
-              value as "draft" | "active" | "completed" | "archived",
-            )
-          }
-        >
-          <SelectTrigger>
-            <SelectValue placeholder="Select status" />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem value="draft">Draft - Study in preparation</SelectItem>
-            <SelectItem value="active">
-              Active - Currently recruiting/running
-            </SelectItem>
-            <SelectItem value="completed">
-              Completed - Data collection finished
-            </SelectItem>
-            <SelectItem value="archived">Archived - Study concluded</SelectItem>
-          </SelectContent>
-        </Select>
-      </FormField>
-    </FormSection>
+      <FormSection
+        title="Configuration"
+        description="Institutional details and ethics approval."
+      >
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+          <FormField>
+            <Label htmlFor="institution">Institution *</Label>
+            <Input
+              id="institution"
+              {...form.register("institution")}
+              placeholder="e.g., University of Technology"
+              className={
+                form.formState.errors.institution ? "border-red-500" : ""
+              }
+            />
+            {form.formState.errors.institution && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.institution.message}
+              </p>
+            )}
+          </FormField>
+
+          <FormField>
+            <Label htmlFor="irbProtocolNumber">IRB Protocol Number</Label>
+            <Input
+              id="irbProtocolNumber"
+              {...form.register("irbProtocolNumber")}
+              placeholder="e.g., IRB-2024-001"
+              className={
+                form.formState.errors.irbProtocolNumber ? "border-red-500" : ""
+              }
+            />
+            {form.formState.errors.irbProtocolNumber && (
+              <p className="text-sm text-red-600">
+                {form.formState.errors.irbProtocolNumber.message}
+              </p>
+            )}
+            <p className="text-muted-foreground text-xs">
+              Optional: Institutional Review Board protocol number if applicable
+            </p>
+          </FormField>
+        </div>
+      </FormSection>
+    </div>
   );
 
   // Sidebar content
@@ -324,7 +346,7 @@ export function StudyForm({ mode, studyId }: StudyFormProps) {
       error={error}
       onDelete={mode === "edit" ? onDelete : undefined}
       isDeleting={isDeleting}
-      sidebar={sidebar}
+      sidebar={mode === "create" ? sidebar : undefined}
       submitButtonId="tour-study-submit"
       extraActions={
         <Button variant="ghost" size="sm" onClick={() => startTour("study_creation")}>
diff --git a/src/components/ui/entity-form.tsx b/src/components/ui/entity-form.tsx
index 5e9180e..cfde91a 100755
--- a/src/components/ui/entity-form.tsx
+++ b/src/components/ui/entity-form.tsx
@@ -127,12 +127,14 @@ export function EntityForm<T extends FieldValues = FieldValues>({
       <div
         className={cn(
           "grid gap-8 w-full",
-          layout === "default" && "grid-cols-1 lg:grid-cols-3", // Keep the column split but remove max-width
-          layout === "full-width" && "grid-cols-1",
+          // If sidebar exists, use 2-column layout. If not, use full width (max-w-7xl centered).
+          sidebar && layout === "default"
+            ? "grid-cols-1 lg:grid-cols-3"
+            : "grid-cols-1 max-w-7xl mx-auto",
         )}
       >
         {/* Main Form */}
-        <div className={layout === "default" ? "lg:col-span-2" : "col-span-1"}>
+        <div className={sidebar && layout === "default" ? "lg:col-span-2" : "col-span-1"}>
           <Card>
             <CardHeader>
               <CardTitle>