diff --git a/app/Views/shared/content_requests.php b/app/Views/shared/content_requests.php
index 2982a4a..c1697ef 100644
--- a/app/Views/shared/content_requests.php
+++ b/app/Views/shared/content_requests.php
@@ -77,7 +77,7 @@
 		</div>
 
 		<div class="flex-1 overflow-y-auto px-4 pb-4">
-				<template x-if="isLoading">
+			<template x-if="isLoading">
 				<table class="table table-xs table-zebra w-full">
 					<thead class="bg-base-100 sticky top-0 z-10">
 						<tr>
@@ -183,10 +183,10 @@
 								</div>
 							</th>
 							<th style='width:20%;'>Tests</th>
-<th style='width:4%;'>ResTo</th>
-<th style='width:5%;'>Val</th>
-<th style='width:5%;'>Result</th>
-<th style='width:5%;'></th>
+							<th style='width:4%;'>ResTo</th>
+							<th style='width:5%;'>Val</th>
+							<th style='width:5%;'>Result</th>
+							<th style='width:5%;'></th>
 						</tr>
 					</thead>
 					<tbody>
@@ -199,65 +199,56 @@
 								<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>
-<div class="dropdown dropdown-end dropdown-hover">
-<div tabindex="0" role="button" 
-class="btn btn-xs w-full"
-:class="req.VAL1USER && req.VAL2USER ? 'btn-success text-white' : 'btn-warning'">
-<i class="fa fa-clipboard-check mr-1"></i>
-<span class="text-xs" x-text="req.VAL1USER && req.VAL2USER ? 'Ready' : 'Pending'"></span>
-</div>
-<ul tabindex="0"
-class="dropdown-content menu bg-base-100 rounded-box z-[1] w-40 p-2 shadow-lg border border-base-300">
-<template x-if="req.VAL1USER && req.VAL2USER">
-<div>
-<li>
-<a :href="'<?=base_url('report/');?>' + req.SP_ACCESSNUMBER" target="_blank">
-<i class="fa fa-print mr-2"></i> Print
-</a>
-</li>
-<template x-if="<?= in_array(session()->get('userroleid'), [1, 2]) ? 'true' : 'false' ?>">
-<li>
-<a @click="openGenerateDialog(req.SP_ACCESSNUMBER)">
-<i class="fa fa-file-pdf mr-2"></i> Generate
-</a>
-</li>
-</template>
-<template x-if="<?= !in_array(session()->get('userroleid'), [1, 2]) ? 'true' : 'false' ?>">
-<li>
-<a :href="'http://glenlis/pdf/' + req.REQDATE.split(' ')[0].split('-').join('/') + '/' + req.SP_ACCESSNUMBER + '.pdf'" target="_blank">
-<i class="fa fa-file-pdf mr-2"></i> PDF
-</a>
-</li>
-</template>
-<li>
-<a @click="openGenerateDialog(req.SP_ACCESSNUMBER)">
-<i class="fa fa-file-pdf mr-2"></i>
-<span>Generate Result</span>
-</a>
-</li>
-</div>
-</template>
-<template x-if="!req.VAL1USER || !req.VAL2USER">
-<div>
-<li class="disabled opacity-50 cursor-not-allowed">
-<span class="flex items-center">
-<i class="fa fa-clock mr-2"></i> Result Pending
-</span>
-</li>
-</div>
-</template>
-</ul>
-</div>
-</td>
-<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>
+								<div class="dropdown dropdown-end dropdown-hover">
+									<div tabindex="0" role="button"
+										class="btn btn-xs w-full"
+										:class="req.VAL1USER && req.VAL2USER ? 'btn-success text-white' : 'btn-warning'">
+										<i class="fa fa-clipboard-check mr-1"></i>
+										<span class="text-xs" x-text="req.VAL1USER && req.VAL2USER ? 'Ready' : 'Pending'"></span>
+									</div>
+									<ul tabindex="0"
+										class="dropdown-content menu bg-base-100 rounded-box z-[1] w-40 p-2 shadow-lg border border-base-300">
+										<template x-if="req.VAL1USER && req.VAL2USER">
+											<div>
+												<li>
+													<a :href="'<?=base_url('report/');?>' + req.SP_ACCESSNUMBER" target="_blank">
+														<i class="fa fa-print mr-2"></i> Print
+													</a>
+												</li>
+												<li>
+													<a :href="'http://glenlis/pdf/' + req.REQDATE.split(' ')[0].split('-').join('/') + '/' + req.SP_ACCESSNUMBER + '.pdf'" target="_blank">
+														<i class="fa fa-file-pdf mr-2"></i> PDF
+													</a>
+												</li>
+												<li>
+													<a @click="openGenerateDialog(req.SP_ACCESSNUMBER)">
+														<i class="fa fa-file-pdf mr-2"></i>
+														<span>Generate Result</span>
+													</a>
+												</li>
+											</div>
+										</template>
+										<template x-if="!req.VAL1USER || !req.VAL2USER">
+											<div>
+												<li class="disabled opacity-50 cursor-not-allowed">
+													<span class="flex items-center">
+														<i class="fa fa-clock mr-2"></i> Result Pending
+													</span>
+												</li>
+											</div>
+										</template>
+									</ul>
+								</div>
+							</td>
+							<td>
 									<div class="dropdown dropdown-end dropdown-hover">
 										<div tabindex="0" role="button" class="btn btn-xs btn-primary w-full">
 											<i class="fa fa-cog mr-1"></i> Actions