diff --git a/index.php b/index.php
index f2a1f3f..b9530b5 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ if( $_SESSION['access'] != 1 ) {
 		if ($result1->num_rows >0){
 			echo "<table align='center'><tr><th>Event ID</th><th>Unit</th><th>Alert</th><th>Start Date and Time</th><th>Description</th><th>End Date and Time</th><th>User</th><th>Edit</th></tr>";
 			while ($row1 = $result1->fetch_assoc()) {
-				echo "<tr><td><a href=https://utilities.mon.liquidweb.com/bms/viewevent.php?eventid=".$row1["event_id"]." target=_blank>".$row1["event_id"]."</a></td><td>".$row1["unit_name"]."</td><td>".$row1["alert_name"]."</td><td>".$row1["date_time_start"]."</td><td>".$row1["description"]."</td><td>".$row1["date_time_end"]."</td><td>".$row1["user"]."</td><td><a href=http://utilities.mon.liquidweb.com/bms/editevent.php?event_id=".$row1["event_id"]." target=blank>Edit</a></td></tr> ";
+				echo "<tr><td><a href=https://DOMAIN.com/bms/viewevent.php?eventid=".$row1["event_id"]." target=_blank>".$row1["event_id"]."</a></td><td>".$row1["unit_name"]."</td><td>".$row1["alert_name"]."</td><td>".$row1["date_time_start"]."</td><td>".$row1["description"]."</td><td>".$row1["date_time_end"]."</td><td>".$row1["user"]."</td><td><a href=http://DOMAIN.com/bms/editevent.php?event_id=".$row1["event_id"]." target=blank>Edit</a></td></tr> ";
 			}
 			echo "</table>";
 		} else {
@@ -52,7 +52,7 @@ if( $_SESSION['access'] != 1 ) {
 			echo "This does not include ongoing events.";
 			echo "<table align='center'><tr><th>Event ID</th><th>Unit</th><th>Alert</th><th>Start Date and Time</th><th>Description</th><th>End Date and Time</th><th>User</th><th>Edit</th></tr>";
 			while ($row2 = $result2->fetch_assoc()) {
-			        echo "<tr><td><a href=https://utilities.mon.liquidweb.com/bms/viewevent.php?eventid=".$row2["event_id"]." target=_blank>".$row2["event_id"]."</a></td><td>".$row2["unit_name"]."</td><td>".$row2["alert_name"]."</td><td>".$row2["date_time_start"]."</td><td>".$row2["description"]."</td><td>".$row2["date_time_end"]."</td><td>".$row2["user"]."</td><td><a href=http://utilities.mon.liquidweb.com/bms/editevent.php?event_id=".$row2["event_id"]." target=blank>Edit</a></td></tr> ";
+			        echo "<tr><td><a href=https://DOMAIN.com/bms/viewevent.php?eventid=".$row2["event_id"]." target=_blank>".$row2["event_id"]."</a></td><td>".$row2["unit_name"]."</td><td>".$row2["alert_name"]."</td><td>".$row2["date_time_start"]."</td><td>".$row2["description"]."</td><td>".$row2["date_time_end"]."</td><td>".$row2["user"]."</td><td><a href=http://DOMAIN.com/bms/editevent.php?event_id=".$row2["event_id"]." target=blank>Edit</a></td></tr> ";
 			}
 			echo "</table>";
 		} else {
diff --git a/search_results.php b/search_results.php
index 8402cb5..a352fb7 100644
--- a/search_results.php
+++ b/search_results.php
@@ -58,7 +58,7 @@ if($result->num_rows >0){
                 if ($result->num_rows >0){
                         echo "<table align='center'><tr><th>Event ID</th><th>Unit</th><th>Alert</th><th>Start Date and Time</th><th>Description</th><th>End Date and Time</th><th>User</th><th>Edit</th></tr>";
                         while ($row1 = $result->fetch_assoc()) {
-                                echo "<tr><td><a href=https://utilities.mon.liquidweb.com/bms/viewevent.php?eventid=".$row1["event_id"]." target=_blank>".$row1["event_id"]."</a></td><td>".$row1["unit_name"]."</td><td>".$row1["alert_name"]."</td><td>".$row1["date_time_start"]."</td><td>".$row1["description"]."</td><td>".$row1["date_time_end"]."</td><td>".$row1["user"]."</td><td><a href=http://utilities.mon.liquidweb.com/bms/editevent.php?event_id=".$row1["event_id"]." target=blank>Edit</a></td></tr> ";
+                                echo "<tr><td><a href=https://DOMAIN.com/bms/viewevent.php?eventid=".$row1["event_id"]." target=_blank>".$row1["event_id"]."</a></td><td>".$row1["unit_name"]."</td><td>".$row1["alert_name"]."</td><td>".$row1["date_time_start"]."</td><td>".$row1["description"]."</td><td>".$row1["date_time_end"]."</td><td>".$row1["user"]."</td><td><a href=http://DOMAIN.com/bms/editevent.php?event_id=".$row1["event_id"]." target=blank>Edit</a></td></tr> ";
                         }
                         echo "</table>";
                 }
diff --git a/viewevent.php b/viewevent.php
index cbd2af5..74c5493 100644
--- a/viewevent.php
+++ b/viewevent.php
@@ -9,7 +9,7 @@ if( $_SESSION['access'] != 1 ) {
 ?>
 <html>
         <head>
-                <link rel="stylesheet" type="text/css" href="css/style.css">
+                <link rel="stylesheet" type="text/css" href="css/sestyle.css">
                 <link rel="shortcut icon" href="favicon.ico" />
                 <title>BMS Events</title>
         </head>
@@ -21,8 +21,8 @@ if( $_SESSION['access'] != 1 ) {
                                 echo "Hello, ";
                                 print_r($_SESSION['uname']);
                         }
-			echo "<h2>View Event</h2>";
-		include("includes/menu.php"); ?>
+                        echo "<h2>View Event</h2>";
+                include("includes/menu.php"); ?>
         </div>
         <div class=content>
 <?php include "includes/db_config.php";
@@ -35,34 +35,41 @@ $eventid=$_GET['eventid'];
                 $result1 = $conn1->query($sql1);
                 if ($result1->num_rows >0){
                         while ($row1 = $result1->fetch_assoc()) {
-			echo "<br />";
-      echo "<table align='center'><tr><td>";
-      echo "Unit: ";
-      echo "</td><td>";
-      print_r($row1['unit_name']);
-      echo "</td></tr><tr><td>";
-      echo "Alert: ";
-      echo "</td><td>";
-      print_r($row1['alert_name']);
-      echo "</td></tr><tr><td>";
-      echo "Start Date and Time: ";
-      echo "</td><td>";
-      print_r($row1['date_time_start']);
-      echo "</td></tr><tr><td>";
-      echo "Currently Ongoing? ";
-      echo "</td><td>";
-              if($row1['is_ongoing'] ==1) {
-                      echo "Yes";
-              } else {
-                      echo "No";
-              }
-      echo "</td></tr><tr><td>";
-      echo "End Date and Time: ";
-      echo "</td><td>";
-      print_r($row1['date_time_end']);
-      echo "</td></tr></table>";
-		}
-		} else {
+                        echo "<br />";
+                        echo "<table align='center'><tr><td>";
+                        echo "Unit: ";
+                        echo "</td><td>";
+                        print_r($row1['unit_name']);
+                        echo "</td></tr><tr><td>";
+                        echo "Alert: ";
+                        echo "</td><td>";
+                        print_r($row1['alert_name']);
+                        echo "</td></tr><tr><td>";
+                        echo "Description: ";
+                        echo "</td><td>";
+                        echo nl2br($row1['description']);
+                        echo "</td></tr><tr><td>";
+                        echo "Start Date and Time: ";
+                        echo "</td><td>";
+                        print_r($row1['date_time_start']);
+                        echo "</td></tr><tr><td>";
+                        echo "Currently Ongoing? ";
+                        echo "</td><td>";
+                                if($row1['is_ongoing'] ==1) {
+                                        echo "Yes";
+                                } else {
+                                        echo "No";
+                                }
+                        echo "</td></tr><tr><td>";
+                        echo "End Date and Time: ";
+                        echo "</td><td>";
+                        print_r($row1['date_time_end']);
+                        echo "</td></tr>";
+                        echo "<tr><td colspan='2' class='ui-helper-center'>";
+                        echo "<a href=editevent.php?event_id=".$row1['event_id'].">Edit Event</a>";
+                        echo "</td></tr></table>";
+                }
+                } else {
                         echo "<h4>ERROR Event ID Not Found</h4>";
                 }
                 if ($conn1->connect_error) {