diff --git a/app/Views/shared/content_requests.php b/app/Views/shared/content_requests.php
index e2a1d13..984914e 100644
--- a/app/Views/shared/content_requests.php
+++ b/app/Views/shared/content_requests.php
@@ -1,3 +1,16 @@
+<?php
+$configFile = include __DIR__ . '/config.php';
+$roleMap = ['superuser' => 'superuser', 'admin' => 'admin', 'lab analyst' => 'lab', 'phlebotomist' => 'phlebo', 'customer service' => 'cs'];
+$userRole = strtolower(session('userrole') ?? '');
+$configKey = $roleMap[$userRole] ?? '';
+$previewEnabled = $configFile[$configKey]['previewEnabled'] ?? false;
+$userRoleId = (int) session('userroleid');
+$userId = (string) session('userid');
+$userLevel = (int) session()->get('userlevel');
+$isPhlebo = $userRoleId === 3;
+$isAdminSuper = !in_array($userRoleId, [3, 4]);
+$canUnval = $userLevel <= 1;
+?>
 <div class="card bg-base-100 shadow-xl border border-base-200 h-full">
 	<div class="card-body p-0 flex flex-col h-full">
 
@@ -200,25 +213,18 @@
 								<td x-text="req.REFF" :class="statusRowBg[req.STATS]"></td>
 								<td x-text="req.DOC" :class="statusRowBg[req.STATS]"></td>
 								<td x-text="req.TESTS" :class="statusRowBg[req.STATS]"></td>
-							<td x-text="req.ODR_CRESULT_TO"></td>
-							<td>
-								<div class='text-xs'>
-									<p>1: <span x-text="req.VAL1USER"></span></p>
-									<p>2: <span x-text="req.VAL2USER"></span></p>
-								</div>
-							</td>
-							<td class="text-center">
-								<i class="fa fa-file-pdf" :class="req.ISPDF ? 'text-success' : 'text-base-300'"></i>
-							</td>
-							<?php
-$configFile = include __DIR__ . '/config.php';
-$roleMap = ['superuser' => 'superuser', 'admin' => 'admin', 'lab analyst' => 'lab', 'phlebotomist' => 'phlebo', 'customer service' => 'cs'];
-$userRole = strtolower(session('userrole') ?? '');
-$configKey = $roleMap[$userRole] ?? '';
-$previewEnabled = $configFile[$configKey]['previewEnabled'] ?? false;
-?>
-							<td>
-								<?php if (session('userroleid') == 3): ?>
+						<td x-text="req.ODR_CRESULT_TO"></td>
+						<td>
+							<div class='text-xs'>
+								<p>1: <span x-text="req.VAL1USER"></span></p>
+								<p>2: <span x-text="req.VAL2USER"></span></p>
+							</div>
+						</td>
+						<td class="text-center">
+							<i class="fa fa-file-pdf" :class="req.ISPDF ? 'text-success' : 'text-base-300'"></i>
+						</td>
+						<td>
+							<?php if ($isPhlebo): ?>
 								<span class="text-xs font-bold" :class="req.VAL1USER && req.VAL2USER ? 'text-success' : 'text-warning'" x-text="req.VAL1USER && req.VAL2USER ? 'Ready' : 'Pending'"></span>
 								<?php else: ?>
 								<?php if ($previewEnabled): ?>
@@ -277,21 +283,19 @@ $previewEnabled = $configFile[$configKey]['previewEnabled'] ?? false;
 															<i class="fa fa-file-pdf mr-2"></i> PDF Eng
 														</a>
 													</li>
-							<?php if (!in_array(session('userroleid'), [3, 4])): ?>
-												<li>
-													<a @click="openGenerateDialog(req.SP_ACCESSNUMBER)">
-														<i class="fa fa-file-pdf mr-2"></i>
-														<span>Generate Result</span>
-													</a>
-												</li>
-							<?php endif; ?>
-							<?php if (!in_array(session('userroleid'), [3, 4])): ?>
-												<li x-show="!req.REPORT_LANG || req.REPORT_LANG != 1">
-													<a @click="openEngResultDialog(req)">
-														<i class="fa fa-language mr-2"></i>
-														<span>Create Eng Result</span>
-													</a>
-												</li>
+<?php if ($isAdminSuper): ?>
+								<li>
+									<a @click="openGenerateDialog(req.SP_ACCESSNUMBER)">
+										<i class="fa fa-file-pdf mr-2"></i>
+										<span>Generate Result</span>
+									</a>
+								</li>
+								<li x-show="!req.REPORT_LANG || req.REPORT_LANG != 1">
+									<a @click="openEngResultDialog(req)">
+										<i class="fa fa-language mr-2"></i>
+										<span>Create Eng Result</span>
+									</a>
+								</li>
 							<?php endif; ?>
 												</div>
 										</template>
@@ -321,9 +325,9 @@ $previewEnabled = $configFile[$configKey]['previewEnabled'] ?? false;
 									</div>
 									<ul tabindex="0"
 										class="dropdown-content menu bg-base-100 rounded-box z-50 w-48 p-2 shadow-lg border border-base-300 text-xs">
-										<?php if (!in_array(session('userroleid'), [3, 4])): ?>
-										<li x-show="req.ISVAL == 1 && req.ISPENDING != 1 && (req.VAL1USER == '<?= session('userid'); ?>' || req.VAL2USER == '<?= session('userid'); ?>')">
-											<?php if (session()->get('userlevel') <= 1): ?>
+										<?php if ($isAdminSuper): ?>
+										<li x-show="req.ISVAL == 1 && req.ISPENDING != 1 && (req.VAL1USER == '<?= $userId; ?>' || req.VAL2USER == '<?= $userId; ?>')">
+											<?php if ($canUnval): ?>
 											<a @click="openUnvalDialog(req.SP_ACCESSNUMBER)" class="text-error hover:bg-error/10">
 												<i class="fa fa-times-circle mr-2"></i> UnVal
 											</a>