diff --git a/dashboard.php b/dashboard.php
deleted file mode 100644
index b11fdeb..0000000
--- a/dashboard.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-
-// Load environment variables
-$envFile = __DIR__ . '/.env';
-$envVars = parse_ini_file($envFile);
-// Database connection settings
-$dbHost = $envVars['DB_HOST'];
-$dbUser = $envVars['DB_USER'];
-$dbPass = $envVars['DB_PASS'];
-$dbName = $envVars['DB_NAME'];
-
-// Create database connection
-$conn = new mysqli($dbHost, $dbUser, $dbPass, $dbName);
-
-// Check connection
-if ($conn->connect_error) {
-    die("Connection failed: " . $conn->connect_error);
-}
-
-// Pagination settings from localStorage or defaults
-$page = isset($_GET['page']) ? (int)$_GET['page'] : 1;
-$limit = isset($_COOKIE['ticketsPerPage']) ? (int)$_COOKIE['ticketsPerPage'] : 15;
-$defaultSortColumn = isset($_COOKIE['defaultSortColumn']) ? $_COOKIE['defaultSortColumn'] : 'ticket_id';
-$sortDirection = isset($_COOKIE['sortDirection']) ? $_COOKIE['sortDirection'] : 'desc';
-$offset = ($page - 1) * $limit;
-
-// Get total number of tickets based on current filter
-$status = isset($_GET['status']) ? $_GET['status'] : 'Open';
-$statuses = explode(',', $status);
-$whereClause = "";
-if (isset($_GET['status'])) {
-    $statuses = explode(',', $_GET['status']);
-    $whereClause = "WHERE status IN ('" . implode("','", $statuses) . "')";
-} else {
-    $whereClause = "WHERE status = 'Open'";
-}
-$totalTicketsQuery = "SELECT COUNT(*) as total FROM tickets $whereClause";
-$totalTicketsResult = $conn->query($totalTicketsQuery);
-$totalTickets = $totalTicketsResult->fetch_assoc()['total'];
-$totalPages = ceil($totalTickets / $limit);
-
-// Modify SQL to use these settings and filter
-$sql = "SELECT * FROM tickets $whereClause ORDER BY $defaultSortColumn $sortDirection LIMIT $limit OFFSET $offset";
-$result = $conn->query($sql);
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Ticket Dashboard</title>
-    <link rel="icon" type="image/png" href="assets/images/favicon.png">
-    <link rel="stylesheet" href="assets/css/dashboard.css">
-    <script src="assets/js/dashboard.js"></script>
-</head>
-<body>
-    <div class="dashboard-header">
-        <h1>Tinker Tickets</h1>
-        <button onclick="window.location.href='new_ticket.php'" class="btn create-ticket">New Ticket</button>
-    </div>
-    
-    <div class="table-controls">
-        <div class="ticket-count">
-            Total Tickets: <?php echo $totalTickets; ?>
-        </div>
-        <div class="table-actions">
-            <div class="pagination">
-                <?php
-                // Previous page button
-                if ($page > 1) {
-                    echo "<button onclick='window.location.href=\"?page=" . ($page - 1) . "&status=$status\"'>«</button>";
-                }
-
-                // Page number buttons
-                for ($i = 1; $i <= $totalPages; $i++) {
-                    $activeClass = ($i === $page) ? 'active' : '';
-                    echo "<button class='$activeClass' onclick='window.location.href=\"?page=$i&status=$status\"'>$i</button>";
-                }
-
-                // Next page button
-                if ($page < $totalPages) {
-                    echo "<button onclick='window.location.href=\"?page=" . ($page + 1) . "&status=$status\"'>»</button>";
-                }
-                ?>
-            </div>
-            <div class="settings-icon">
-                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                    <circle cx="12" cy="12" r="3"></circle>
-                    <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"></path>
-                </svg>
-            </div>
-        </div>
-    </div>
-
-    <table>
-        <thead>
-            <tr>
-                <th>Ticket ID</th>
-                <th>Priority</th>
-                <th>Title</th>
-                <th>Category</th>
-                <th>Type</th>
-                <th>Status</th>
-                <th>Created</th>
-                <th>Updated</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php
-            if ($result->num_rows > 0) {
-                while($row = $result->fetch_assoc()) {
-                    echo "<tr class='priority-{$row['priority']}'>";
-                    echo "<td><a href='ticket.php?id={$row['ticket_id']}' class='ticket-link'>{$row['ticket_id']}</a></td>";
-                    echo "<td><span>{$row['priority']}</span></td>";
-                    echo "<td>{$row['title']}</td>";
-                    echo "<td>{$row['category']}</td>";
-                    echo "<td>{$row['type']}</td>";
-                    echo "<td class='status-{$row['status']}'>{$row['status']}</td>";
-                    echo "<td>" . date('Y-m-d H:i', strtotime($row['created_at'])) . "</td>";
-                    echo "<td>" . date('Y-m-d H:i', strtotime($row['updated_at'])) . "</td>";
-                    echo "</tr>";
-                }
-            } else {
-                echo "<tr><td colspan='8'>No tickets found</td></tr>";
-            }
-            ?>
-        </tbody>
-    </table>
-
-    <?php $conn->close(); ?>
-    <script>
-    document.body.dataset.categories = JSON.stringify([
-        <?php 
-        $categories = [];
-        mysqli_data_seek($categoriesResult, 0);
-        while($row = $categoriesResult->fetch_assoc()) {
-            $categories[] = "'" . $row['category'] . "'";
-        }
-        echo implode(',', $categories);
-        ?>
-    ]);
-    document.body.dataset.types = JSON.stringify([
-        <?php 
-        $types = [];
-        mysqli_data_seek($typesResult, 0);
-        while($row = $typesResult->fetch_assoc()) {
-            $types[] = "'" . $row['type'] . "'";
-        }
-        echo implode(',', $types);
-        ?>
-    ]);
-</script>
-
-</body>
-</html>
diff --git a/new_ticket.php b/new_ticket.php
deleted file mode 100644
index 3f5ef8d..0000000
--- a/new_ticket.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-// Load environment variables
-$envFile = __DIR__ . '/.env';
-$envVars = parse_ini_file($envFile);
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Create New Ticket</title>
-    <link rel="icon" type="image/png" href="assets/images/favicon.png">
-    <link rel="stylesheet" href="assets/css/dashboard.css">
-    <link rel="stylesheet" href="assets/css/ticket.css">
-    <script src="assets/js/dashboard.js"></script>
-</head>
-<body>
-    <div class="ticket-container">
-        <div class="ticket-header">
-            <h1>Create New Ticket</h1>
-        </div>
-
-        <form id="newTicketForm" class="ticket-details">
-            <div class="detail-group">
-                <label>Title</label>
-                <input type="text" name="title" required class="editable">
-            </div>
-
-            <div class="detail-group status-priority-row">
-                <div class="detail-quarter">
-                    <label>Status</label>
-                    <select name="status" required class="editable">
-                        <option value="Open">Open</option>
-                        <option value="Closed">Closed</option>
-                    </select>
-                </div>
-                <div class="detail-quarter">
-                    <label>Priority</label>
-                    <select name="priority" required class="editable">
-                        <option value="1">P1 - Critical Impact</option>
-                        <option value="2">P2 - High Impact</option>
-                        <option value="3">P3 - Medium Impact</option>
-                        <option value="4">P4 - Low Impact</option>
-                    </select>
-                </div>
-                <div class="detail-quarter">
-                    <label>Category</label>
-                    <select name="category" required class="editable">
-                        <option value="Hardware">Hardware</option>
-                        <option value="Software">Software</option>
-                        <option value="Network">Network</option>
-                        <option value="Security">Security</option>
-                        <option value="Other">Other</option>
-                    </select>
-                </div>
-                <div class="detail-quarter">
-                    <label>Type</label>
-                    <select name="type" required class="editable">
-                        <option value="Incident">Incident</option>
-                        <option value="Request">Request</option>
-                        <option value="Problem">Problem</option>
-                        <option value="Task">Task</option>
-                    </select>
-                </div>
-            </div>
-
-
-            <div class="detail-group full-width">
-                <label>Description</label>
-                <textarea name="description" required class="editable"></textarea>
-            </div>
-
-            <div class="form-actions">
-                <button type="button" onclick="window.location.href='dashboard.php'" class="btn">Cancel</button>
-                <button type="submit" class="btn create-ticket">Create Ticket</button>
-            </div>
-        </form>
-    </div>
-
-    <script>
-        document.getElementById('newTicketForm').addEventListener('submit', function(e) {
-            e.preventDefault();
-            const formData = new FormData(this);
-            const data = {};
-            formData.forEach((value, key) => data[key] = value);
-
-            fetch('create_ticket_api.php', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(data)
-            })
-            .then(response => response.json())
-            .then(data => {
-                if(data.success) {
-                    window.location.href = 'ticket.php?id=' + data.ticket_id;
-                }
-            });
-        });
-    </script>
-</body>
-</html>
diff --git a/ticket.php b/ticket.php
deleted file mode 100644
index 89a0ffe..0000000
--- a/ticket.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-// Load environment variables and DB connection (same as dashboard.php)
-$envFile = __DIR__ . "/.env";
-$envVars = parse_ini_file($envFile);
-$conn = new mysqli(
-    $envVars["DB_HOST"],
-    $envVars["DB_USER"],
-    $envVars["DB_PASS"],
-    $envVars["DB_NAME"]
-);
-
-$ticket_id = $_GET["id"];
-$sql = "SELECT * FROM tickets WHERE ticket_id = ?";
-$stmt = $conn->prepare($sql);
-$stmt->bind_param("i", $ticket_id);
-$stmt->execute();
-$result = $stmt->get_result();
-$ticket = $result->fetch_assoc();
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Ticket #<?php echo $ticket_id; ?></title>
-    <link rel="icon" type="image/png" href="assets/images/favicon.png">
-    <link rel="stylesheet" href="assets/css/dashboard.css">
-    <link rel="stylesheet" href="assets/css/ticket.css">
-    <script src="assets/js/dashboard.js"></script>
-    <script src="assets/js/ticket.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
-    <script>
-    // Store ticket data in a global variable
-    window.ticketData = {
-        ticket_id: "<?php echo $ticket['ticket_id']; ?>",
-        title: "<?php echo htmlspecialchars($ticket['title']); ?>",
-        status: "<?php echo $ticket['status']; ?>",
-        priority: "<?php echo $ticket['priority']; ?>",
-        category: "<?php echo $ticket['category']; ?>",
-        type: "<?php echo $ticket['type']; ?>"
-    };
-</script>
-</head>
-<body>
-    <div class="ticket-container" data-priority="<?php echo $ticket[
-        "priority"
-    ]; ?>">
-        <div class="ticket-header">
-            <h2><input type="text" class="editable title-input" value="<?php echo $ticket[
-                "title"
-            ]; ?>" data-field="title" disabled></h2>
-            <div class="ticket-subheader">
-                <div class="ticket-id">UUID <?php echo $ticket_id; ?></div>
-                <div class="header-controls">
-                    <div class="status-priority-group">
-                        <span id="statusDisplay" class="status-<?php echo $ticket[
-                            "status"
-                        ]; ?>"><?php echo $ticket["status"]; ?></span>
-                        <span class="priority-indicator priority-<?php echo $ticket[
-                            "priority"
-                        ]; ?>">P<?php echo $ticket["priority"]; ?></span>
-                    </div>
-                    <button id="editButton" class="btn" onclick="toggleEditMode()">Edit Ticket</button>
-                </div>
-            </div>
-        </div>
-        <div class="ticket-details">
-        <!--
-        <div class="detail-group status-priority-row">
-            <div class="detail-quarter">
-                <label>Status</label>
-                <select class="editable" data-field="status" disabled>
-                    <option value="Open" <?php echo $ticket["status"] == "Open"
-                        ? "selected"
-                        : ""; ?>>Open</option>
-                    <option value="Closed" <?php echo $ticket["status"] ==
-                    "Closed"
-                        ? "selected"
-                        : ""; ?>>Closed</option>
-                </select>
-            </div>
-            <div class="detail-quarter">
-                <label>Priority</label>
-                <select class="editable" data-field="priority" disabled>
-                    <option value="1" <?php echo $ticket["priority"] == 1
-                        ? "selected"
-                        : ""; ?>>P1 - Critical Impact</option>
-                    <option value="2" <?php echo $ticket["priority"] == 2
-                        ? "selected"
-                        : ""; ?>>P2 - High Impact</option>
-                    <option value="3" <?php echo $ticket["priority"] == 3
-                        ? "selected"
-                        : ""; ?>>P3 - Medium Impact</option>
-                    <option value="4" <?php echo $ticket["priority"] == 4
-                        ? "selected"
-                        : ""; ?>>P4 - Low Impact</option>
-                </select>
-            </div>
-            <div class="detail-quarter">
-                <label>Category</label>
-                <select class="editable" data-field="category" disabled>
-                    <option value="Hardware" <?php echo $ticket["category"] ==
-                    "Hardware"
-                        ? "selected"
-                        : ""; ?>>Hardware</option>
-                    <option value="Software" <?php echo $ticket["category"] ==
-                    "Software"
-                        ? "selected"
-                        : ""; ?>>Software</option>
-                    <option value="Network" <?php echo $ticket["category"] ==
-                    "Network"
-                        ? "selected"
-                        : ""; ?>>Network</option>
-                    <option value="Security" <?php echo $ticket["category"] ==
-                    "Security"
-                        ? "selected"
-                        : ""; ?>>Security</option>
-                    <option value="Other" <?php echo $ticket["category"] ==
-                    "Other"
-                        ? "selected"
-                        : ""; ?>>Other</option>
-                </select>
-            </div>
-            <div class="detail-quarter">
-                <label>Type</label>
-                <select class="editable" data-field="type" disabled>
-                    <option value="Maintenance" <?php echo $ticket["type"] == "Maintenance" ? "selected" : ""; ?>>Maintenance</option>
-                    <option value="Install" <?php echo $ticket["type"] == "Install" ? "selected" : ""; ?>>Install</option>
-                    <option value="Task" <?php echo $ticket["type"] == "Task" ? "selected" : ""; ?>>Task</option>
-                    <option value="Upgrade" <?php echo $ticket["type"] == "Upgrade" ? "selected" : ""; ?>>Upgrade</option>
-                </select>
-            </div>
-        </div>
-                    -->
-        <div class="ticket-tabs">
-            <button class="tab-btn active" onclick="showTab('description')">Description</button>
-            <button class="tab-btn" onclick="showTab('comments')">Comments</button>
-        </div>
-
-        <div id="description-tab" class="tab-content active">
-            <div class="detail-group full-width">
-                <label>Description</label>
-                <textarea class="editable" data-field="description" disabled><?php echo $ticket[
-                    "description"
-                ]; ?></textarea>
-            </div>
-        </div>
-
-        <div id="comments-tab" class="tab-content">
-            <div class="comments-section">
-                <h2>Comments</h2>
-                <div class="comment-form">
-                    <textarea id="newComment" placeholder="Add a comment..."></textarea>
-                    <div class="comment-controls">
-                        <div class="markdown-toggles">
-                            <div class="preview-toggle">
-                                <label class="switch">
-                                    <input type="checkbox" id="markdownMaster" onchange="toggleMarkdownMode()">
-                                    <span class="slider round"></span>
-                                </label>
-                                <span class="toggle-label">Enable Markdown</span>
-                            </div>
-                            <div class="preview-toggle">
-                                <label class="switch">
-                                    <input type="checkbox" id="markdownToggle" onchange="togglePreview()" disabled>
-                                    <span class="slider round"></span>
-                                </label>
-                                <span class="toggle-label">Preview Markdown</span>
-                            </div>
-                        </div>
-                        <button onclick="addComment()" class="btn">Add Comment</button>
-                    </div>
-                    <div id="markdownPreview" class="markdown-preview" style="display: none;"></div>
-                </div>
-            </div>    
-            <div class="comments-list">
-                <?php
-                $commentsSql = "SELECT * FROM ticket_comments WHERE ticket_id = ? ORDER BY created_at DESC";
-                $stmt = $conn->prepare($commentsSql);
-                $stmt->bind_param("s", $ticket_id);
-                $stmt->execute();
-                $comments = $stmt->get_result();
-                
-                while($comment = $comments->fetch_assoc()) {
-                    echo "<div class='comment'>";
-                    echo "<div class='comment-header'>";
-                    echo "<span class='comment-user'>{$comment['user_name']}</span>";
-                    echo "<span class='comment-date'>" . date('M d, Y H:i', strtotime($comment['created_at'])) . "</span>";
-                    echo "</div>";
-                    echo "<div class='comment-text'>";
-                    if ($comment['markdown_enabled']) {
-                        echo "<script>document.write(marked.parse(" . json_encode($comment['comment_text']) . "))</script>";
-                    } else {
-                        echo htmlspecialchars($comment['comment_text']);
-                    }
-                    echo "</div>";
-                    echo "</div>";
-                }
-                ?>
-            </div>
-        </div>
-    </div>
-            <div class="ticket-footer">
-                <button onclick="window.location.href='dashboard.php'" class="btn back-btn">Back to Dashboard</button>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/views/DashboardView.php b/views/DashboardView.php
index f24a4ea..406bf9b 100644
--- a/views/DashboardView.php
+++ b/views/DashboardView.php
@@ -15,8 +15,7 @@
 <body data-categories='<?php echo json_encode($categories); ?>' data-types='<?php echo json_encode($types); ?>'>
     <div class="dashboard-header">
         <h1>Tinker Tickets</h1>
-        <button onclick="window.location.href='/ticket/create'" class="btn create-ticket">New Ticket</button>
-    </div>
+        <button onclick="window.location.href='<?php echo $GLOBALS['config']['BASE_URL']; ?>/ticket/create'" class="btn create-ticket">New Ticket</button>    </div>
     <div class="search-container">
         <form method="GET" action="" class="search-form">
             <!-- Preserve existing parameters -->

Ticket ID	Priority	Title	Category	Type	Status	Created	Updated
{$row['ticket_id']}	{$row['priority']}	{$row['title']}	{$row['category']}	{$row['type']}	{$row['status']}	" . date('Y-m-d H:i', strtotime($row['created_at'])) . "	" . date('Y-m-d H:i', strtotime($row['updated_at'])) . "
No tickets found