diff --git a/add_client_login_modal.php b/add_client_login_modal.php
index 940d6ac7..5dd38b6b 100644
--- a/add_client_login_modal.php
+++ b/add_client_login_modal.php
@@ -39,83 +39,91 @@
           </div>
           <center><a class="btn btn-link" data-toggle="collapse" href="#optionsCollapse" role="button" aria-expanded="false" aria-controls="optionsCollapse">Link Options</a></center>
           <div class="collapse multi-collapse" id="optionsCollapse">
-            <center>
-              <a class="btn btn-primary btn-sm" data-toggle="collapse" href="#vendorCollapse" role="button" aria-expanded="false" aria-controls="vendorCollapse">Vendor</a>
-              <a class="btn btn-primary btn-sm" data-toggle="collapse" href="#assetCollapse" role="button" aria-expanded="false" aria-controls="assetCollapse">Asset</a>
-              <a class="btn btn-primary btn-sm" data-toggle="collapse" href="#applicationCollapse" role="button" aria-expanded="false" aria-controls="applicationCollapse">Application</a>
-            </center>
-            <div class="collapse multi-collapse" id="vendorCollapse">
-              <div class="form-group">
-                <label>Vendor</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-building"></i></span>
+            <ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
+              <li class="nav-item">
+                <a class="nav-link" id="pills-vendor-tab" data-toggle="pill" href="#pills-vendor" role="tab" aria-controls="pills-vendor" aria-selected="true">Vendor</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" id="pills-asset-tab" data-toggle="pill" href="#pills-asset" role="tab" aria-controls="pills-asset" aria-selected="false">Asset</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" id="pills-application-tab" data-toggle="pill" href="#pills-application" role="tab" aria-controls="pill-application" aria-selected="false">Application</a>
+              </li>
+            </ul>
+            <div class="tab-content" id="pills-tabContent">
+              <div class="tab-pane fade" id="pills-vendor" role="tabpanel" aria-labelledby="pills-vendor-tab">
+                <div class="form-group">
+                  <label>Vendor</label>
+                  <div class="input-group">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text"><i class="fa fa-building"></i></span>
+                    </div>
+                    <select class="form-control" name="vendor">
+                      <option value="">- Vendor -</option>
+                      <?php 
+                      
+                      $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
+                      while($row = mysqli_fetch_array($sql)){
+                        $vendor_id = $row['client_vendor_id'];
+                        $vendor_name = $row['client_vendor_name'];
+                      ?>
+                        <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+                      
+                      <?php
+                      }
+                      ?>
+                    </select>
                   </div>
-                  <select class="form-control" name="vendor">
-                    <option value="">- Vendor -</option>
-                    <?php 
-                    
-                    $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id"); 
-                    while($row = mysqli_fetch_array($sql)){
-                      $vendor_id = $row['client_vendor_id'];
-                      $vendor_name = $row['client_vendor_name'];
-                    ?>
-                      <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
                 </div>
               </div>
-            </div>
-            <div class="collapse multi-collapse" id="assetCollapse">
-              <div class="form-group">
-                <label>Asset</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-tag"></i></span>
+              <div class="tab-pane fade" id="pills-asset" role="tabpanel" aria-labelledby="pills-asset-tab">
+                <div class="form-group">
+                  <label>Asset</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="asset">
+                      <option value="">- Asset -</option>
+                      <?php 
+                      
+                      $sql = mysqli_query($mysqli,"SELECT * FROM client_assets WHERE client_id = $client_id"); 
+                      while($row = mysqli_fetch_array($sql)){
+                        $asset_id = $row['client_asset_id'];
+                        $asset_name = $row['client_asset_name'];
+                      ?>
+                        <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
+                      
+                      <?php
+                      }
+                      ?>
+                    </select>
                   </div>
-                  <select class="form-control" name="vendor">
-                    <option value="">- Asset -</option>
-                    <?php 
-                    
-                    $sql = mysqli_query($mysqli,"SELECT * FROM client_assets WHERE client_id = $client_id"); 
-                    while($row = mysqli_fetch_array($sql)){
-                      $asset_id = $row['client_asset_id'];
-                      $asset_name = $row['client_asset_name'];
-                    ?>
-                      <option value="<?php echo $asset_id; ?>"><?php echo $asset_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
                 </div>
               </div>
-            </div>
-            <div class="collapse multi-collapse" id="applicationCollapse">
-              <div class="form-group">
-                <label>Application</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-building"></i></span>
+              <div class="tab-pane fade" id="pills-application" role="tabpanel" aria-labelledby="pills-application-tab">
+                <div class="form-group">
+                  <label>Application</label>
+                  <div class="input-group">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text"><i class="fa fa-building"></i></span>
+                    </div>
+                    <select class="form-control" name="application">
+                      <option value="">- Application -</option>
+                      <?php 
+                      
+                      $sql = mysqli_query($mysqli,"SELECT * FROM client_applications WHERE client_id = $client_id"); 
+                      while($row = mysqli_fetch_array($sql)){
+                        $client_application_id = $row['client_application_id'];
+                        $client_application_name = $row['client_application_name'];
+                      ?>
+                        <option value="<?php echo $client_application_id; ?>"><?php echo $client_application_name; ?></option>
+                      
+                      <?php
+                      }
+                      ?>
+                    </select>
                   </div>
-                  <select class="form-control" name="vendor">
-                    <option value="">- Application -</option>
-                    <?php 
-                    
-                    $sql = mysqli_query($mysqli,"SELECT * FROM client_applications WHERE client_id = $client_id"); 
-                    while($row = mysqli_fetch_array($sql)){
-                      $client_application_id = $row['client_application_id'];
-                      $client_application_name = $row['client_application_name'];
-                    ?>
-                      <option value="<?php echo $client_application_id; ?>"><?php echo $client_application_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
                 </div>
               </div>
             </div>
diff --git a/calendar.php b/calendar.php
new file mode 100644
index 00000000..f6ff7a36
--- /dev/null
+++ b/calendar.php
@@ -0,0 +1,88 @@
+<?php include("header.php"); ?>
+
+<div class="card">
+  <div class="card-header">
+    <h6 class="float-left mt-1"><i class="fa fa-calendar"></i> Janurary 2019</h6>
+    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#print"><i class="fas fa-print"></i> Print</button>
+    <select class="form-control mt-5">
+      <option>Janurary</option>
+      <option>February</option>
+      <option>March</option>
+      <option>April</option>
+    </select>
+  </div>
+  <div class="card-body">
+    <div class="table-responsive">
+      <table class="table table-bordered">
+        <thead class="thead-dark">
+          <tr>
+            <th class="text-center">Sunday</th>
+            <th class="text-center">Monday</th>
+            <th class="text-center">Tuesday</th>
+            <th class="text-center">Wednesday</th>
+            <th class="text-center">Thursday</th>
+            <th class="text-center">Friday</th>
+            <th class="text-center">Saturday</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>
+              <p>1</p>
+              <span class="badge badge-primary">Security Assessment</span>
+              <br>
+              <span class="badge badge-danger">INV-001 Overdue</span>
+            </td>
+            <td>2</td>
+            <td>3</td>
+            <td>4</td>
+            <td>5</td>
+            <td>6</td>
+            <td>7</td>
+          </tr>
+          <tr>
+            <td>8</td>
+            <td>9</td>
+            <td>10</td>
+            <td>11</td>
+            <td>12</td>
+            <td>13</td>
+            <td>14</td>
+          </tr>
+          <tr>
+            <td>15</td>
+            <td>16</td>
+            <td>17</td>
+            <td>18</td>
+            <td>19</td>
+            <td>20</td>
+            <td>21</td>
+          </tr>
+          <tr>
+            <td>22</td>
+            <td>23</td>
+            <td>24</td>
+            <td>25</td>
+            <td>26</td>
+            <td>27</td>
+            <td>28</td>
+          </tr>
+          <tr>
+            <td>29</td>
+            <td>30</td>
+            <td>31</td>
+            <td colspan="4"></td>
+          </tr>
+        </tbody>
+      </table>
+      <strong>Calendars</strong>
+      <ul class="list-unstyled">
+        <li><span class="badge badge-primary">Jobs</span></li>
+        <li><span class="badge badge-danger">Alerts</span></li>
+        <li><span class="badge badge-warning">Expiration</span></li>
+        <li><span class="badge badge-success">Payments</span></li>
+    </div>
+  </div>
+</div>
+
+<?php include("footer.php");
\ No newline at end of file
diff --git a/client_vendors.php b/client_vendors.php
index 81e2ce71..8429ecd1 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -18,12 +18,13 @@
         $client_vendor_name = $row['client_vendor_name'];
         $client_vendor_description = $row['client_vendor_description'];
         $client_vendor_account_number = $row['client_vendor_account_number'];
-  
+          
       ?>
       <tr>
         <td><?php echo $client_vendor_name; ?></td>
         <td><?php echo $client_vendor_description; ?></td>
         <td><?php echo $client_vendor_account_number; ?></td>
+
         <td>
           <div class="dropdown dropleft text-center">
             <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/post.php b/post.php
index bcd92f8f..e8fd4b51 100644
--- a/post.php
+++ b/post.php
@@ -685,8 +685,11 @@ if(isset($_POST['add_client_login'])){
     $username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['username']));
     $password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['password']));
     $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
+    $vendor_id = intval($_POST['vendor']);
+    $asset_id = intval($_POST['asset']);
+    $application_id = intval($_POST['application']);
 
-    mysqli_query($mysqli,"INSERT INTO client_logins SET client_login_description = '$description', client_login_username = '$username', client_login_password = '$password', client_login_note = '$note', client_id = $client_id");
+    mysqli_query($mysqli,"INSERT INTO client_logins SET client_login_description = '$description', client_login_username = '$username', client_login_password = '$password', client_login_note = '$note', client_vendor_id = $vendor_id, client_asset_id = $asset_id, client_application_id = $application_id, client_id = $client_id");
 
     $_SESSION['alert_message'] = "Login added";