diff --git a/portal/index.php b/portal/index.php
index 9f20d98e..023f3ca2 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -6,132 +6,27 @@
 
 require_once("inc_portal.php");
 
-// Ticket status from GET
-if (!isset($_GET['status'])) {
-    // If nothing is set, assume we only want to see open tickets
-    $status = 'Open';
-    $ticket_status_snippet = "ticket_status != 'Closed'";
-} elseif (isset($_GET['status']) && ($_GET['status']) == 'Open') {
-    $status = 'Open';
-    $ticket_status_snippet = "ticket_status != 'Closed'";
-} elseif (isset($_GET['status']) && ($_GET['status']) == 'Closed') {
-    $status = 'Closed';
-    $ticket_status_snippet = "ticket_status = 'Closed'";
-} else {
-    $status = '%';
-    $ticket_status_snippet = "ticket_status LIKE '%'";
-}
-
-$contact_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE $ticket_status_snippet AND ticket_contact_id = '$session_contact_id' AND ticket_client_id = '$session_client_id' ORDER BY ticket_id DESC");
-
-//Get Total tickets closed
-$sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_closed FROM tickets WHERE ticket_status = 'Closed' AND ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
-$row = mysqli_fetch_array($sql_total_tickets_closed);
-$total_tickets_closed = $row['total_tickets_closed'];
-
-//Get Total tickets open
-$sql_total_tickets_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_open FROM tickets WHERE ticket_status != 'Closed' AND ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
-$row = mysqli_fetch_array($sql_total_tickets_open);
-$total_tickets_open = $row['total_tickets_open'];
-
-//Get Total tickets 
-$sql_total_tickets = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets FROM tickets WHERE  ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
-$row = mysqli_fetch_array($sql_total_tickets);
-$total_tickets = $row['total_tickets'];
-
-
 ?>
-    <table>
-        <tr>
-            <th class="text-center">
-                <?php if (!empty($session_contact_photo)) { ?>
-                    <img src="<?php echo "../uploads/clients/$session_company_id/$session_client_id/$session_contact_photo"; ?>" alt="..." class=" img-size-50 img-circle">
 
-                <?php } else { ?>
+<div class="row">
+    <div class="col-1 text-center">
+        <?php if (!empty($session_contact_photo)) { ?>
+            <img src="<?php echo "../uploads/clients/$session_company_id/$session_client_id/$session_contact_photo"; ?>" alt="..." height="50" width="50" class="img-circle img-responsive">
 
-                    <span class="fa-stack fa-2x rounded-left">
-        <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-        <span class="fa fa-stack-1x text-white"><?php echo $session_contact_initials; ?></span>
-      </span>
-                    <br>
+        <?php } else { ?>
 
-                <?php } ?>
-                <div class="text-dark"><?php echo $session_contact_name; ?></div>
-                <div><?php echo $session_contact_title; ?></div>
-            </th>
-            <th>
-                <div class="">
-                    <h4 class="">Welcome, <b><?php echo $session_contact_name ?></b>!</h4>
-                    <hr>
-                </div>
-            </th>
-        </tr>
-    </table>
-
-    <br>
-
-    <div class="row">
-
-        <div class="col-10">
-            <div class="card">
-      <span class="border border-secondary">
-        <table class="table">
-          <thead class="thead-dark">
-            <tr>
-              <th scope="col">#</th>
-              <th scope="col">Subject</th>
-              <th scope="col">Status</th>
-            </tr>
-          </thead>
-          <tbody>
-
-            <?php
-            while ($row = mysqli_fetch_array($contact_tickets)) {
-                $ticket_id = $row['ticket_id'];
-                $ticket_prefix = htmlentities($row['ticket_prefix']);
-                $ticket_number = $row['ticket_number'];
-                $ticket_subject = htmlentities($row['ticket_subject']);
-                $ticket_status = htmlentities($row['ticket_status']);
-
-                echo "<tr>";
-                echo "<td> <a href='ticket.php?id=$ticket_id'> $ticket_prefix$ticket_number</a></td>";
-                echo "<td> <a href='ticket.php?id=$ticket_id'> $ticket_subject</a></td>";
-                echo "<td>$ticket_status</td>";
-                echo "</tr>";
-            }
-            ?>
-          </tbody>
-        </table>
-      </span>
-            </div>
-        </div>
-        <div class="col-2">
-
-            <div class="card">
-                <a href="ticket_add.php" class="btn btn-primary">New ticket</a>
-            </div>
-
-            <hr>
-
-            <a href="?status=Open">
-                <div class="card text-white bg-danger mb-3" style="max-width: 18rem;">
-                    <div class="card-header">My Open tickets | <b><?php echo $total_tickets_open ?></b></div>
-                </div>
-            </a>
-
-            <a href="?status=Closed">
-                <div class="card text-white bg-success mb-3" style="max-width: 18rem;">
-                    <div class="card-header">Resolved tickets | <b><?php echo $total_tickets_closed ?></b></div>
-                </div>
-            </a>
-
-            <a href="?status=%">
-                <div class="card text-white bg-secondary mb-3"  style="max-width: 18rem;">
-                    <div class="card-header">All my tickets | <b><?php echo $total_tickets ?></b></div>
-                </div>
-            </a>
-
-        </div>
+            <span class="fa-stack fa-2x rounded-left">
+                <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                <span class="fa fa-stack-1x text-white"><?php echo $session_contact_initials; ?></span>
+            </span>
+        <?php } ?>
     </div>
 
+    <div class="col-11 p-0">
+        <h4>Welcome, <strong><?php echo $session_contact_name ?></strong>!</h4>
+        <hr>
+    </div>
+
+</div>
+
 <?php require_once("portal_footer.php"); ?>
\ No newline at end of file
diff --git a/portal/login.php b/portal/login.php
index b3ef5f66..ebd664e5 100644
--- a/portal/login.php
+++ b/portal/login.php
@@ -121,11 +121,11 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
                     </div>
                 </div>
 
-                <button type="submit" class="btn btn-success btn-block mb-3" name="login">Login</button>
+                <button type="submit" class="btn btn-success btn-block mb-3" name="login">Sign in</button>
 
                 <?php
                 if (!empty($config_smtp_host)) { ?>
-                    <a href="login_reset.php">Forgotten password?</a>
+                    <a href="login_reset.php">Forgot password?</a>
                 <?php } ?>
 
             </form>
diff --git a/portal/portal_header.php b/portal/portal_header.php
index ede24c9f..9b5cf7df 100644
--- a/portal/portal_header.php
+++ b/portal/portal_header.php
@@ -42,22 +42,19 @@
                 </li>
                 <?php if ($session_contact_id == $session_client_primary_contact_id) { ?>
                     <li class="nav-item">
-                        <a class="nav-link" href="ticket_view_all.php">All Tickets</a>
+                        <a class="nav-link <?php if (basename($_SERVER['PHP_SELF']) == "tickets.php" || basename($_SERVER['PHP_SELF']) == "ticket_add.php") {echo "active";} ?>" href="tickets.php">Tickets</a>
                     </li>
                 <?php } ?>
-                <li class="nav-item">
-                    <a class="nav-link" href="ticket_add.php">New Ticket</a>
-                </li>
             </ul>
             <ul class="nav navbar-nav pull-right">
                 <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown">
                         <?php echo $session_contact_name ?>
                     </a>
                     <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                         <a class="dropdown-item" href="profile.php">Profile</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="portal_post.php?logout">Logout</a>
+                        <a class="dropdown-item" href="portal_post.php?logout">Sign out</a>
                     </div>
                 </li>
             </ul>
diff --git a/portal/ticket.php b/portal/ticket.php
index 918d7cca..e5a5f926 100644
--- a/portal/ticket.php
+++ b/portal/ticket.php
@@ -27,33 +27,31 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
         $ticket_details = $ticket_row['ticket_details'];
         $ticket_feedback = htmlentities($ticket_row['ticket_feedback']);
 
-
         ?>
 
-        <nav class="navbar navbar-dark bg-dark">
-
-            <i class="fas fa-fw fa-ticket-alt text-secondary"></i> <a class="navbar-brand">Ticket <?php echo $ticket_prefix, $ticket_number ?></a>
-
-            <span class="navbar-text">
-      <?php
-      if ($ticket_status !== "Closed") { ?>
-          <button class="btn btn-sm btn-outline-success my-2 my-sm-0 form-inline my-2 my-lg-0" type="submit"><a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>"><i class="fas fa-fw fa-check text-secondary text-success"></i>  Close ticket</a></button>
-      <?php } ?>
-    </span>
-
-        </nav>
-
         <div class="card">
-            <div class="card-header">
-                <h3 class="card-title"><b>Subject:</b> <?php echo $ticket_subject ?></h3>
+            <div class="card-header bg-dark">
+                <h4 class="text-center mt-1">
+                    Ticket <?php echo $ticket_prefix, $ticket_number ?> 
+                    <?php
+                    if ($ticket_status !== "Closed") {
+                    ?>
+                    <a href="portal_post.php?close_ticket=<?php echo $ticket_id; ?>" class="btn btn-sm btn-outline-success float-right text-white"><i class="fas fa-fw fa-check text-success"></i> Close ticket</a>
+                    <?php
+                    }
+                    ?>
+                </h4>
             </div>
+
             <div class="card-body">
+                <h5><strong>Subject:</strong> <?php echo $ticket_subject ?></h5>
+                <hr>
                 <p>
-                    <b>State:</b> <?php echo $ticket_status ?>
+                    <strong>State:</strong> <?php echo $ticket_status ?>
                     <br>
-                    <b>Priority:</b> <?php echo $ticket_priority ?>
+                    <strong>Priority:</strong> <?php echo $ticket_priority ?>
                 </p>
-                <b>Issue:</b> <?php echo $ticket_details ?>
+                <strong>Issue:</strong> <?php echo $ticket_details ?>
             </div>
         </div>
 
@@ -61,15 +59,15 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
         <!-- Either show the reply comments box, ticket smiley feedback, or thanks for feedback -->
 
         <?php if ($ticket_status !== "Closed") { ?>
-            <div class="form-group">
-                <form action="portal_post.php" method="post">
-                    <div class="form-group">
-                        <textarea class="form-control" name="comment" placeholder="Add comments.."></textarea>
-                    </div>
-                    <input type="hidden" name="ticket_id" value="<?php echo $ticket_id ?>">
-                    <button type="submit" class="btn btn-primary" name="add_ticket_comment">Save reply</button>
-                </form>
-            </div>
+           
+            <form action="portal_post.php" method="post">
+                <input type="hidden" name="ticket_id" value="<?php echo $ticket_id ?>">
+                <div class="form-group">
+                    <textarea class="form-control" name="comment" placeholder="Add comments.."></textarea>
+                </div>
+                <button type="submit" class="btn btn-primary" name="add_ticket_comment">Save reply</button>
+            </form>
+           
         <?php }
 
         elseif (empty($ticket_feedback)) { ?>
@@ -98,7 +96,8 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
 
         <!-- End comments/feedback -->
 
-        <hr><br>
+        <hr>
+        <br>
 
         <?php
         $sql = mysqli_query($mysqli, "SELECT * FROM ticket_replies LEFT JOIN users ON ticket_reply_by = user_id LEFT JOIN contacts ON ticket_reply_by = contact_id WHERE ticket_reply_ticket_id = $ticket_id AND ticket_reply_archived_at IS NULL AND ticket_reply_type != 'Internal' ORDER BY ticket_reply_id DESC");
@@ -129,14 +128,18 @@ if (isset($_GET['id']) && intval($_GET['id'])) {
                 <div class="card-header">
                     <h3 class="card-title">
                         <div class="media">
-                            <?php if (!empty($user_avatar)) { ?>
+                            <?php 
+                            if (!empty($user_avatar)) { 
+                            ?>
                                 <img src="<?php echo $avatar_link ?>" alt="User Avatar" class="img-size-50 mr-3 img-circle">
-                            <?php } else { ?>
+                            <?php 
+                            } else { 
+                            ?>
                                 <span class="fa-stack fa-2x">
-            <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-            <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
-          </span>
-                                <?php
+                                    <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                                    <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
+                                </span>
+                            <?php
                             }
                             ?>
 
diff --git a/portal/tickets.php b/portal/tickets.php
new file mode 100644
index 00000000..b1ad1005
--- /dev/null
+++ b/portal/tickets.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ * Client Portal
+ * Landing / Home page for the client portal
+ */
+
+require_once("inc_portal.php");
+
+// Ticket status from GET
+if (!isset($_GET['status'])) {
+    // If nothing is set, assume we only want to see open tickets
+    $status = 'Open';
+    $ticket_status_snippet = "ticket_status != 'Closed'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Open') {
+    $status = 'Open';
+    $ticket_status_snippet = "ticket_status != 'Closed'";
+} elseif (isset($_GET['status']) && ($_GET['status']) == 'Closed') {
+    $status = 'Closed';
+    $ticket_status_snippet = "ticket_status = 'Closed'";
+} else {
+    $status = '%';
+    $ticket_status_snippet = "ticket_status LIKE '%'";
+}
+
+$contact_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE $ticket_status_snippet AND ticket_contact_id = '$session_contact_id' AND ticket_client_id = '$session_client_id' ORDER BY ticket_id DESC");
+
+//Get Total tickets closed
+$sql_total_tickets_closed = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_closed FROM tickets WHERE ticket_status = 'Closed' AND ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
+$row = mysqli_fetch_array($sql_total_tickets_closed);
+$total_tickets_closed = $row['total_tickets_closed'];
+
+//Get Total tickets open
+$sql_total_tickets_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets_open FROM tickets WHERE ticket_status != 'Closed' AND ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
+$row = mysqli_fetch_array($sql_total_tickets_open);
+$total_tickets_open = $row['total_tickets_open'];
+
+//Get Total tickets 
+$sql_total_tickets = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS total_tickets FROM tickets WHERE  ticket_client_id = $session_client_id AND ticket_contact_id = $session_contact_id");
+$row = mysqli_fetch_array($sql_total_tickets);
+$total_tickets = $row['total_tickets'];
+
+
+?>
+
+<div class="row">
+    <div class="col-1 text-center">
+        <?php if (!empty($session_contact_photo)) { ?>
+            <img src="<?php echo "../uploads/clients/$session_company_id/$session_client_id/$session_contact_photo"; ?>" alt="..." height="50" width="50" class="img-circle img-responsive">
+
+        <?php } else { ?>
+
+            <span class="fa-stack fa-2x rounded-left">
+                <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                <span class="fa fa-stack-1x text-white"><?php echo $session_contact_initials; ?></span>
+            </span>
+        <?php } ?>
+    </div>
+
+    <div class="col-11 p-0">
+        <h4>Welcome, <strong><?php echo $session_contact_name ?></strong>!</h4>
+        <hr>
+    </div>
+
+</div>
+
+<br>
+
+<div class="row">
+
+    <div class="col-10">
+        
+        <table class="table tabled-bordered border border-dark">
+            <thead class="thead-dark">
+                <tr>
+                    <th>#</th>
+                    <th>Subject</th>
+                    <th>Status</th>
+                </tr>
+            </thead>
+            <tbody>
+
+            <?php
+            while ($row = mysqli_fetch_array($contact_tickets)) {
+                $ticket_id = $row['ticket_id'];
+                $ticket_prefix = htmlentities($row['ticket_prefix']);
+                $ticket_number = $row['ticket_number'];
+                $ticket_subject = htmlentities($row['ticket_subject']);
+                $ticket_status = htmlentities($row['ticket_status']);
+            ?>
+
+                <tr>
+                    <td>
+                        <a href="ticket.php?id=<?php echo $ticket_id; ?>"><?php echo "$ticket_prefix$ticket_number"; ?></a>
+                    </td>
+                    <td> 
+                        <a href="ticket.php?id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
+                    </td>
+                    <td><?php echo $ticket_status; ?></td> 
+                </tr>
+            <?php
+            }
+            ?>
+            </tbody>
+        </table>
+        
+    </div>
+
+    <div class="col-2">
+
+        <a href="ticket_add.php" class="btn btn-primary btn-block">New ticket</a>
+
+        <hr>
+
+        <a href="?status=Open" class="btn btn-danger btn-block p-3 mb-3 text-left">My Open tickets | <strong><?php echo $total_tickets_open ?></strong></a>
+
+        <a href="?status=Closed" class="btn btn-success btn-block p-3 mb-3 text-left">Resolved tickets | <strong><?php echo $total_tickets_closed ?></strong></a>
+
+        <a href="?status=%" class="btn btn-secondary btn-block p-3 mb-3 text-left">All my tickets | <strong><?php echo $total_tickets ?></strong></a>
+        <?php
+        if($session_contact_id == $session_client_primary_contact_id){
+        ?>
+        
+        <hr>
+        
+        <a href="ticket_view_all.php" class="btn btn-dark btn-block p-2 mb-3">All Tickets</a>
+
+        <?php
+        }
+        ?>
+
+    </div>
+</div>
+
+<?php require_once("portal_footer.php"); ?>
\ No newline at end of file