diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index 6e2ce1cb..5c2de494 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_modal.php
@@ -54,7 +54,7 @@
           </div>
       
           <div class="form-group">
-            <label>Client</label>
+            <label>Income Category</label>
             <div class="input-group">
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
diff --git a/edit_invoice.php b/edit_invoice.php
new file mode 100644
index 00000000..06f2ce79
--- /dev/null
+++ b/edit_invoice.php
@@ -0,0 +1,66 @@
+<div class="modal fade" id="editInvoiceModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-file"></i> Edit Invoice</h5>
+        <button type="button" class="close" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
+
+        <div class="modal-body">
+
+          <div class="form-group">
+            <label>Invoice Date</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d",$invoice_date); ?>" required>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label>Payment Due</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="due" value="<?php echo date("Y-m-d",$invoice_due); ?>" required>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label>Income Category</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+              </div>
+              <select class="form-control" name="category" required>
+                <option value="">- Category -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income'"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $category_id = $row['category_id'];
+                  $category_name = $row['category_name'];
+                ?>
+                <option <?php if($category_id == $invoice_category_id){ ?> selected <?php } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_invoice" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php
new file mode 100644
index 00000000..c73554b0
--- /dev/null
+++ b/edit_invoice_modal.php
@@ -0,0 +1,66 @@
+<div class="modal fade" id="editInvoiceModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-file"></i> Edit Invoice</h5>
+        <button type="button" class="close" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
+
+        <div class="modal-body">
+
+          <div class="form-group">
+            <label>Invoice Date</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="date" value="<?php echo $invoice_date; ?>" required>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label>Payment Due</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
+              </div>
+              <input type="date" class="form-control" name="due" value="<?php echo $invoice_due; ?>" required>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label>Income Category</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-tag"></i></span>
+              </div>
+              <select class="form-control" name="category" required>
+                <option value="">- Category -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income'"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $category_id = $row['category_id'];
+                  $category_name = $row['category_name'];
+                ?>
+                <option <?php if($category_id == $invoice_category_id){ ?> selected <?php } ?> value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_invoice" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/edit_invoice_note_modal.php b/edit_invoice_note_modal.php
new file mode 100644
index 00000000..e516b4c1
--- /dev/null
+++ b/edit_invoice_note_modal.php
@@ -0,0 +1,24 @@
+<div class="modal fade" id="editInvoiceNoteModal" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-edit"></i> Invoice Note</h5>
+        <button type="button" class="close" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
+        <div class="modal-body">
+          <div class="form-group">
+            <textarea class="form-control" rows="8" name="invoice_note"><?php echo $invoice_note; ?></textarea>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+          <button type="submit" name="edit_invoice_note" class="btn btn-primary">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/invoice.php b/invoice.php
index fb25387c..c27aa7df 100644
--- a/invoice.php
+++ b/invoice.php
@@ -18,6 +18,8 @@ if(isset($_GET['invoice_id'])){
   $invoice_date = $row['invoice_date'];
   $invoice_due = $row['invoice_due'];
   $invoice_amount = $row['invoice_amount'];
+  $invoice_note = $row['invoice_note'];
+  $invoice_category_id = $row['category_id'];
   $client_id = $row['client_id'];
   $client_name = $row['client_name'];
   $client_address = $row['client_address'];
@@ -31,7 +33,7 @@ if(isset($_GET['invoice_id'])){
   }
   $client_website = $row['client_website'];
 
-  $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id DESC");
+  $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id ASC");
   
   $sql_payments = mysqli_query($mysqli,"SELECT * FROM invoice_payments, accounts WHERE invoice_payments.account_id = accounts.account_id AND invoice_payments.invoice_id = $invoice_id ORDER BY invoice_payments.invoice_payment_id DESC");
 
@@ -66,7 +68,7 @@ if(isset($_GET['invoice_id'])){
 
 
 ?>
-<div class="row">
+<div class="row d-print-none">
   <div class="col-md-11">
     <h3>Invoice #
       <small class="text-muted">INV-<?php echo $invoice_number; ?></small>
@@ -79,11 +81,13 @@ if(isset($_GET['invoice_id'])){
         <i class="fas fa-ellipsis-h"></i>
       </button>
       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editinvoiceModal<?php echo $invoice_id; ?>">Edit</a>
+        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal">Edit</a>
+        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceNoteModal">Note</a>
         <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Copy</a>
         <a class="dropdown-item" href="email_invoice.php?invoice_id=<?php echo $invoice_id; ?>">Send Email</a>
+        <?php if($invoice_status == "Draft"){ ?><a class="dropdown-item" href="post.php?mark_invoice_sent=<?php echo $invoice_id; ?>">Mark Sent</a><?php } ?>
         <?php if($invoice_status !== "Paid"){ ?><a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoicePaymentModal">Add Payment</a><?php } ?>
-        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addinvoiceCopyModal<?php echo $invoice_id; ?>">Print</a>
+        <a class="dropdown-item" href="#" onclick="window.print();">Print</a>
         <a class="dropdown-item" href="#">Delete</a>
       </div>
     </div>
@@ -120,10 +124,11 @@ if(isset($_GET['invoice_id'])){
   <div class="col-sm">
     <div class="card">
       <div class="card-header">
-        Invoice # <?php echo $invoice_number; ?>
+        Details
       </div>
       <div class="card-body">
         <ul class="list-unstyled">
+          <li class="mb-1"><strong>Invoice Number:</strong> <div class="float-right">INV-<?php echo $invoice_number; ?></div></li>
           <li class="mb-1"><strong>Invoice Date:</strong> <div class="float-right"><?php echo $invoice_date; ?></div></li>
           <li><strong>Payment Due:</strong> <div class="float-right <?php echo $invoice_color; ?>"><?php echo $invoice_due; ?></div></li>
         </ul>
@@ -144,7 +149,7 @@ if(isset($_GET['invoice_id'])){
         <table class="table">
           <thead>
             <tr>
-              <th></th>
+              <th class="d-print-none"></th>
               <th>Product</th>
               <th>Description</th>
               <th class="text-center">Qty</th>
@@ -171,7 +176,7 @@ if(isset($_GET['invoice_id'])){
             ?>
 
             <tr>
-              <td class="text-center"><a class="btn btn-danger btn-sm" href="post.php?delete_invoice_item=<?php echo $invoice_item_id; ?>"><i class="fa fa-trash"></i></a></td>
+              <td class="text-center d-print-none"><a class="btn btn-danger btn-sm" href="post.php?delete_invoice_item=<?php echo $invoice_item_id; ?>"><i class="fa fa-trash"></i></a></td>
               <td><?php echo $invoice_item_name; ?></td>
               <td><?php echo $invoice_item_description; ?></td>
               <td class="text-center"><?php echo $invoice_item_quantity; ?></td>
@@ -186,7 +191,7 @@ if(isset($_GET['invoice_id'])){
 
             ?>
 
-            <tr>
+            <tr class="d-print-none">
               <form action="post.php" method="post">
                 <td class="text-center"><button type="submit" class="btn btn-primary btn-sm" name="add_invoice_item"><i class="fa fa-check"></i></button></td>
                 <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
@@ -200,82 +205,62 @@ if(isset($_GET['invoice_id'])){
                     <option value="0.07">State Tax 7%</option>
                   </select>
                 </td>
-                <td class="text-right">$ 0.00</td>  
+                <td></td>  
               </form>
             </tr>
             <tr>
-              <td colspan="5"></td>
+              <td class="d-print-none"></td>
+              <td colspan="4"></td>
               <td><strong>SubTotal</strong></td>
               <td class="text-right">$<?php echo number_format($sub_total,2); ?></td>
             </tr>
+            <?php if($discount > 0){ ?>
             <tr>
-              <td colspan="5"></td>
+              <td class="d-print-none"></td>
+              <td colspan="4"></td>
               <td><strong>Discount</strong></td>
               <td class="text-right">$<?php echo number_format($invoice_discount,2); ?></td>             
             </tr>
+            <?php } ?>
+            <?php if($total_tax > 0){ ?>
             <tr>
-              <td colspan="5"></td>
+              <td class="d-print-none"></td>
+              <td colspan="4"></td>
               <td><strong>Tax</strong></td>
               <td class="text-right">$<?php echo number_format($total_tax,2); ?></td>        
             </tr>
-            <tr>
-              <td colspan="5"></td>
-              <td><strong>Total</strong></td>
-              <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
-            </tr>
+            <?php } ?>
             <?php if($amount_paid > 0){ ?>
             <tr>
-              <td colspan="5"></td>
-              <td><strong>Paid</strong></td>
-              <td class="text-right text-success">$<?php echo number_format($amount_paid,2); ?></td>
+              <td class="d-print-none"></td>
+              <td colspan="4"></td>
+              <td><strong class="text-success">Paid</strong></td>
+              <td class="text-right text-success">-$<?php echo number_format($amount_paid,2); ?></td>
             </tr>
+            <?php } ?>
             <tr>
-              <td colspan="5"></td>
-              <td><strong>Balance</strong></td>
+              <td class="d-print-none"></td>
+              <td colspan="4"></td>
+              <td><strong>Total</strong></td>
               <td class="text-right">$<?php echo number_format($balance,2); ?></td>
             </tr>
-          <?php } ?>
           </tbody>
         </table>   
     </div>
   </div>
 </div>
-<div class="row mb-3">
-  <div class="col-sm">
-    <div class="card">
-      <div class="card-body">
-        <ul class="nav nav-tabs" id="myTab" role="tablist">
-          <li class="nav-item">
-            <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Invoice Notes</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">History</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" id="contact-tab" data-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">Payments</a>
-          </li>
-        </ul>
-        <div class="tab-content" id="myTabContent">
-          <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">...</div>
-          <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">...</div>
-          <div class="tab-pane fade" id="contact" role="tabpanel" aria-labelledby="contact-tab">...</div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
 <div class="row mb-3">
   <div class="col-sm">
     <div class="card">
       <div class="card-header">
-        Invoice Note
+        Notes
       </div>
       <div class="card-body">
-        <textarea class="form-control" rows="8" name="invoice_note"></textarea>
+        <p><?php echo $invoice_note; ?></p>
       </div>
     </div>
   </div>
-  <div class="col-sm">
+  <div class="col-sm d-print-none">
     <div class="card">
       <div class="card-header">
         History
@@ -312,7 +297,7 @@ if(isset($_GET['invoice_id'])){
       </div>
     </div>
   </div>
-  <div class="col-sm">
+  <div class="col-sm d-print-none">
     <div class="card">
       <div class="card-header">
         Payments
@@ -355,7 +340,8 @@ if(isset($_GET['invoice_id'])){
 </div>
 
 <?php include("add_invoice_payment_modal.php"); ?>
-
+<?php include("edit_invoice_modal.php"); ?>
+<?php include("edit_invoice_note_modal.php"); ?>
 <?php } ?>
 
 <?php include("footer.php");
\ No newline at end of file
diff --git a/post.php b/post.php
index a51aacae..a0eaaaa1 100644
--- a/post.php
+++ b/post.php
@@ -389,7 +389,7 @@ if(isset($_POST['add_invoice'])){
 
     $invoice_id = mysqli_insert_id($mysqli);
 
-    mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = '$todays_date', invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $invoice_id");
+    mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Draft', invoice_history_description = 'INVOICE added!', invoice_id = $invoice_id");
 
     $_SESSION['alert_message'] = "Invoice added";
     
@@ -397,6 +397,35 @@ if(isset($_POST['add_invoice'])){
 
 }
 
+if(isset($_POST['edit_invoice'])){
+
+    $invoice_id = intval($_POST['invoice_id']);
+    $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date']));
+    $due = strip_tags(mysqli_real_escape_string($mysqli,$_POST['due']));
+    $category = intval($_POST['category']);
+
+    mysqli_query($mysqli,"UPDATE invoices SET invoice_date = '$date', invoice_due = '$due', category_id = $category WHERE invoice_id = $invoice_id");
+
+    $_SESSION['alert_message'] = "Invoice modified";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if(isset($_GET['mark_invoice_sent'])){
+
+    $invoice_id = intval($_GET['mark_invoice_sent']);
+
+    mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Sent' WHERE invoice_id = $invoice_id");
+
+    mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = 'Sent', invoice_history_description = 'INVOICE marked sent', invoice_id = $invoice_id");
+
+    $_SESSION['alert_message'] = "Invoice marked sent";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_GET['delete_invoice'])){
     $invoice_id = intval($_GET['delete_invoice']);
 
@@ -496,12 +525,28 @@ if(isset($_POST['add_invoice_payment'])){
     //Update Invoice Status
     mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id");
 
+    //Add Payment to History
+    mysqli_query($mysqli,"INSERT INTO invoice_history SET invoice_history_date = CURDATE(), invoice_history_status = '$invoice_status', invoice_history_description = 'INVOICE payment added', invoice_id = $invoice_id");
+
     $_SESSION['alert_message'] = "Payment added";
     
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
 }
 
+if(isset($_POST['edit_invoice_note'])){
+
+    $invoice_id = intval($_POST['invoice_id']);
+    $invoice_note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['invoice_note']));
+
+    mysqli_query($mysqli,"UPDATE invoices SET invoice_note = '$invoice_note' WHERE invoice_id = $invoice_id");
+
+    $_SESSION['alert_message'] = "Notes added";
+    
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_GET['delete_invoice_payment'])){
     $invoice_payment_id = intval($_GET['delete_invoice_payment']);