diff --git a/roster.php b/roster.php
index 7b2b482..76b0527 100644
--- a/roster.php
+++ b/roster.php
@@ -341,51 +341,55 @@ try {
                             <tr>
                                 <th>SAP Code</th>
                                 <th>Full Name</th>
-                                <th>Legal Entity</th>
-                                <th>Business Unit</th>
-                                <th>Cost Center</th>
                                 <th>Level</th>
-                                <th>Salary</th>
-                                <th>Contributions</th>
-                                <th>Cars</th>
-                                <th>Ticket Restaurant</th>
-                                <th>Metlife</th>
-                                <th>Topus/Month</th>
-                                <th>Total Salary Cost</th>
-                                <th>Total Monthly Cost</th>
-                                <th>Total Annual Cost</th>
-                                <th>Gross Revenue</th>
-                                <th>Discounted Revenue</th>
-                                <th>Daily Cost</th>
+                                <th>Legal Entity</th>
+                                <th>Function</th>
+                                <th>Cost Center</th>
+                                <th>Salary (&euro;)</th>
+                                <th>Employer Contributions (&euro;)</th>
+                                <th>Total Salary Cost (&euro;)</th>
+                                <th>Cars (&euro;)</th>
+                                <th>Metlife (&euro;)</th>
+                                <th>Ticket Restaurant (&euro;)</th>
+                                <th>Bonus/Month (&euro;)</th>
+                                <th>Daily Cost (&euro;)</th>
+                                <th>Total Monthly Cost (&euro;)</th>
+                                <th>Total Annual Cost (&euro;)</th>
+                                <th>Gross Revenue (&euro;)</th>
+                                <th>Discounted Revenue (&euro;)</th>
                                 <th>Actions</th>
                             </tr>
                         </thead>
                         <tbody>
                             <?php if (empty($roster_data)): ?>
                                 <tr>
-                                    <td colspan="15" class="text-center text-secondary">No roster data found.</td>
+                                    <td colspan="19" class="text-center text-secondary">No roster data found.</td>
                                 </tr>
                             <?php else: ?>
                                 <?php foreach ($roster_data as $row): ?>
                                     <tr>
                                         <td><?php echo htmlspecialchars($row['sapCode']); ?></td>
-                                        <td><?php echo htmlspecialchars($row['fullNameEn']); ?></td>
+                                        <td>
+                                            <a href="#" class="view-btn" data-bs-toggle="modal" data-bs-target="#viewResourceModal" data-row='<?php echo htmlspecialchars(json_encode($row), ENT_QUOTES, 'UTF-8'); ?>'>
+                                                <?php echo htmlspecialchars($row['fullNameEn']); ?>
+                                            </a>
+                                        </td>
+                                        <td><?php echo htmlspecialchars($row['level']); ?></td>
                                         <td><?php echo htmlspecialchars($row['legalEntity']); ?></td>
                                         <td><?php echo htmlspecialchars($row['functionBusinessUnit']); ?></td>
                                         <td><?php echo htmlspecialchars($row['costCenterCode']); ?></td>
-                                        <td><?php echo htmlspecialchars($row['level']); ?></td>
                                         <td>&euro;<?php echo number_format($row['newAmendedSalary'], 2); ?></td>
                                         <td>&euro;<?php echo number_format($row['employerContributions'], 2); ?></td>
-                                        <td>&euro;<?php echo number_format($row['cars'], 2); ?></td>
-                                        <td>&euro;<?php echo number_format($row['ticketRestaurant'], 2); ?></td>
-                                        <td>&euro;<?php echo number_format($row['metlife'], 2); ?></td>
-                                        <td>&euro;<?php echo number_format($row['topusPerMonth'], 2); ?></td>
                                         <td>&euro;<?php echo number_format($row['totalSalaryCostWithLabor'], 2); ?></td>
+                                        <td>&euro;<?php echo number_format($row['cars'], 2); ?></td>
+                                        <td>&euro;<?php echo number_format($row['metlife'], 2); ?></td>
+                                        <td>&euro;<?php echo number_format($row['ticketRestaurant'], 2); ?></td>
+                                        <td>&euro;<?php echo number_format($row['topusPerMonth'], 2); ?></td>
+                                        <td>&euro;<?php echo number_format($row['totalMonthlyCost'] / 20, 2); ?></td>
                                         <td>&euro;<?php echo number_format($row['totalMonthlyCost'], 2); ?></td>
                                         <td>&euro;<?php echo number_format($row['totalAnnualCost'], 2); ?></td>
                                         <td>&euro;<?php echo number_format($row['grossRevenue'], 2); ?></td>
                                         <td>&euro;<?php echo number_format($row['discountedRevenue'], 2); ?></td>
-                                        <td>&euro;<?php echo number_format($row['totalMonthlyCost'] / 20, 2); ?></td>
                                         <td>
                                             <div class="d-flex">
                                                 <button class="btn btn-sm btn-outline-info me-2 view-btn"
@@ -424,6 +428,7 @@ try {
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
+                        <h5 class="mb-3">Employee Information</h5>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label for="sapCode" class="form-label">SAP Code</label>
@@ -433,6 +438,19 @@ try {
                                 <label for="fullNameEn" class="form-label">Full Name</label>
                                 <input type="text" class="form-control" id="fullNameEn" name="fullNameEn" required>
                             </div>
+                            <div class="col-md-6 mb-3">
+                                <label for="level" class="form-label">Level</label>
+                                <select class="form-select" id="level" name="level">
+                                    <option value="">Select Level</option>
+                                    <option value="BUSINESS ANALYST">BUSINESS ANALYST</option>
+                                    <option value="CONSULTANT">CONSULTANT</option>
+                                    <option value="SENIOR CONSULTANT">SENIOR CONSULTANT</option>
+                                    <option value="ASSISTANT MANAGER">ASSISTANT MANAGER</option>
+                                    <option value="MANAGER">MANAGER</option>
+                                    <option value="SENIOR MANAGER">SENIOR MANAGER</option>
+                                    <option value="Intern">Intern</option>
+                                </select>
+                            </div>
                             <div class="col-md-6 mb-3">
                                 <label for="legalEntity" class="form-label">Legal Entity</label>
                                 <input type="text" class="form-control" id="legalEntity" name="legalEntity">
@@ -445,34 +463,42 @@ try {
                                 <label for="costCenterCode" class="form-label">Cost Center Code</label>
                                 <input type="text" class="form-control" id="costCenterCode" name="costCenterCode">
                             </div>
+                        </div>
+
+                        <h5 class="my-3">Compensation Details</h5>
+                        <div class="row">
                             <div class="col-md-6 mb-3">
-                                <label for="level" class="form-label">Level</label>
-                                <input type="text" class="form-control" id="level" name="level">
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label for="newAmendedSalary" class="form-label">New Amended Salary (&euro;)</label>
+                                <label for="newAmendedSalary" class="form-label">Salary (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="newAmendedSalary" name="newAmendedSalary" value="0">
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label for="employerContributions" class="form-label">Employer Contributions (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="employerContributions" name="employerContributions" value="0">
                             </div>
+                        </div>
+
+                        <h5 class="my-3">Benefits & Allowances</h5>
+                        <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label for="cars" class="form-label">Cars (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="cars" name="cars" value="0">
                             </div>
-                            <div class="col-md-6 mb-3">
-                                <label for="ticketRestaurant" class="form-label">Ticket Restaurant (&euro;)</label>
-                                <input type="number" step="0.01" class="form-control" id="ticketRestaurant" name="ticketRestaurant" value="0">
-                            </div>
                             <div class="col-md-6 mb-3">
                                 <label for="metlife" class="form-label">Metlife (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="metlife" name="metlife" value="0">
                             </div>
                             <div class="col-md-6 mb-3">
-                                <label for="topusPerMonth" class="form-label">Topus/Month (&euro;)</label>
+                                <label for="ticketRestaurant" class="form-label">Ticket Restaurant (&euro;)</label>
+                                <input type="number" step="0.01" class="form-control" id="ticketRestaurant" name="ticketRestaurant" value="0">
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label for="topusPerMonth" class="form-label">Bonus/Month (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="topusPerMonth" name="topusPerMonth" value="0">
                             </div>
+                        </div>
+
+                        <h5 class="my-3">Revenue Information</h5>
+                        <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label for="grossRevenue" class="form-label">Gross Revenue (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="grossRevenue" name="grossRevenue" value="0">
@@ -507,6 +533,7 @@ try {
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body">
+                        <h5 class="mb-3">Employee Information</h5>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label for="edit-sapCode" class="form-label">SAP Code</label>
@@ -516,6 +543,19 @@ try {
                                 <label for="edit-fullNameEn" class="form-label">Full Name</label>
                                 <input type="text" class="form-control" id="edit-fullNameEn" name="fullNameEn" required>
                             </div>
+                            <div class="col-md-6 mb-3">
+                                <label for="edit-level" class="form-label">Level</label>
+                                <select class="form-select" id="edit-level" name="level">
+                                    <option value="">Select Level</option>
+                                    <option value="BUSINESS ANALYST">BUSINESS ANALYST</option>
+                                    <option value="CONSULTANT">CONSULTANT</option>
+                                    <option value="SENIOR CONSULTANT">SENIOR CONSULTANT</option>
+                                    <option value="ASSISTANT MANAGER">ASSISTANT MANAGER</option>
+                                    <option value="MANAGER">MANAGER</option>
+                                    <option value="SENIOR MANAGER">SENIOR MANAGER</option>
+                                    <option value="Intern">Intern</option>
+                                </select>
+                            </div>
                             <div class="col-md-6 mb-3">
                                 <label for="edit-legalEntity" class="form-label">Legal Entity</label>
                                 <input type="text" class="form-control" id="edit-legalEntity" name="legalEntity">
@@ -528,34 +568,42 @@ try {
                                 <label for="edit-costCenterCode" class="form-label">Cost Center Code</label>
                                 <input type="text" class="form-control" id="edit-costCenterCode" name="costCenterCode">
                             </div>
+                        </div>
+
+                        <h5 class="my-3">Compensation Details</h5>
+                        <div class="row">
                             <div class="col-md-6 mb-3">
-                                <label for="edit-level" class="form-label">Level</label>
-                                <input type="text" class="form-control" id="edit-level" name="level">
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label for="edit-newAmendedSalary" class="form-label">New Amended Salary (&euro;)</label>
+                                <label for="edit-newAmendedSalary" class="form-label">Salary (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="edit-newAmendedSalary" name="newAmendedSalary">
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label for="edit-employerContributions" class="form-label">Employer Contributions (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="edit-employerContributions" name="employerContributions">
                             </div>
+                        </div>
+
+                        <h5 class="my-3">Benefits & Allowances</h5>
+                        <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label for="edit-cars" class="form-label">Cars (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="edit-cars" name="cars">
                             </div>
-                            <div class="col-md-6 mb-3">
-                                <label for="edit-ticketRestaurant" class="form-label">Ticket Restaurant (&euro;)</label>
-                                <input type="number" step="0.01" class="form-control" id="edit-ticketRestaurant" name="ticketRestaurant">
-                            </div>
                             <div class="col-md-6 mb-3">
                                 <label for="edit-metlife" class="form-label">Metlife (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="edit-metlife" name="metlife">
                             </div>
                             <div class="col-md-6 mb-3">
-                                <label for="edit-topusPerMonth" class="form-label">Topus/Month (&euro;)</label>
+                                <label for="edit-ticketRestaurant" class="form-label">Ticket Restaurant (&euro;)</label>
+                                <input type="number" step="0.01" class="form-control" id="edit-ticketRestaurant" name="ticketRestaurant">
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label for="edit-topusPerMonth" class="form-label">Bonus/Month (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="edit-topusPerMonth" name="topusPerMonth">
                             </div>
+                        </div>
+
+                        <h5 class="my-3">Revenue Information</h5>
+                        <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label for="edit-grossRevenue" class="form-label">Gross Revenue (&euro;)</label>
                                 <input type="number" step="0.01" class="form-control" id="edit-grossRevenue" name="grossRevenue">
@@ -584,6 +632,7 @@ try {
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
+                    <h5 class="mb-3">Employee Information</h5>
                     <div class="row">
                         <div class="col-md-6 mb-3">
                             <label class="form-label">SAP Code</label>
@@ -593,6 +642,10 @@ try {
                             <label class="form-label">Full Name</label>
                             <input type="text" class="form-control" id="view-fullNameEn" readonly>
                         </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Level</label>
+                            <input type="text" class="form-control" id="view-level" readonly>
+                        </div>
                         <div class="col-md-6 mb-3">
                             <label class="form-label">Legal Entity</label>
                             <input type="text" class="form-control" id="view-legalEntity" readonly>
@@ -605,37 +658,49 @@ try {
                             <label class="form-label">Cost Center Code</label>
                             <input type="text" class="form-control" id="view-costCenterCode" readonly>
                         </div>
+                    </div>
+
+                    <h5 class="my-3">Compensation Details</h5>
+                    <div class="row">
                         <div class="col-md-6 mb-3">
-                            <label class="form-label">Level</label>
-                            <input type="text" class="form-control" id="view-level" readonly>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">New Amended Salary (&euro;)</label>
+                            <label class="form-label">Salary (&euro;)</label>
                             <input type="text" class="form-control" id="view-newAmendedSalary" readonly>
                         </div>
                         <div class="col-md-6 mb-3">
                             <label class="form-label">Employer Contributions (&euro;)</label>
                             <input type="text" class="form-control" id="view-employerContributions" readonly>
                         </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Total Salary Cost With Labor (&euro;)</label>
+                            <input type="text" class="form-control" id="view-totalSalaryCostWithLabor" readonly>
+                        </div>
+                    </div>
+
+                    <h5 class="my-3">Benefits & Allowances</h5>
+                    <div class="row">
                         <div class="col-md-6 mb-3">
                             <label class="form-label">Cars (&euro;)</label>
                             <input type="text" class="form-control" id="view-cars" readonly>
                         </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Ticket Restaurant (&euro;)</label>
-                            <input type="text" class="form-control" id="view-ticketRestaurant" readonly>
-                        </div>
                         <div class="col-md-6 mb-3">
                             <label class="form-label">Metlife (&euro;)</label>
                             <input type="text" class="form-control" id="view-metlife" readonly>
                         </div>
                         <div class="col-md-6 mb-3">
-                            <label class="form-label">Topus/Month (&euro;)</label>
+                            <label class="form-label">Ticket Restaurant (&euro;)</label>
+                            <input type="text" class="form-control" id="view-ticketRestaurant" readonly>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Bonus/Month (&euro;)</label>
                             <input type="text" class="form-control" id="view-topusPerMonth" readonly>
                         </div>
-                         <div class="col-md-6 mb-3">
-                            <label class="form-label">Total Salary Cost With Labor (&euro;)</label>
-                            <input type="text" class="form-control" id="view-totalSalaryCostWithLabor" readonly>
+                    </div>
+
+                    <h5 class="my-3">Cost Analysis</h5>
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Daily Cost (&euro;)</label>
+                            <input type="text" class="form-control" id="view-dailyCost" readonly>
                         </div>
                         <div class="col-md-6 mb-3">
                             <label class="form-label">Total Monthly Cost (&euro;)</label>
@@ -645,6 +710,10 @@ try {
                             <label class="form-label">Total Annual Cost (&euro;)</label>
                             <input type="text" class="form-control" id="view-totalAnnualCost" readonly>
                         </div>
+                    </div>
+
+                    <h5 class="my-3">Revenue Information</h5>
+                    <div class="row">
                         <div class="col-md-6 mb-3">
                             <label class="form-label">Gross Revenue (&euro;)</label>
                             <input type="text" class="form-control" id="view-grossRevenue" readonly>
@@ -653,10 +722,6 @@ try {
                             <label class="form-label">Discounted Revenue (&euro;)</label>
                             <input type="text" class="form-control" id="view-discountedRevenue" readonly>
                         </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Daily Cost (&euro;)</label>
-                            <input type="text" class="form-control" id="view-dailyCost" readonly>
-                        </div>
                     </div>
                 </div>
                 <div class="modal-footer">