diff --git a/add_product_modal.php b/add_product_modal.php
index 2d22c9c6..2d10f10a 100644
--- a/add_product_modal.php
+++ b/add_product_modal.php
@@ -13,6 +13,31 @@
             <label>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" placeholder="Product name" required autofocus>
           </div>
+          
+          <div class="form-group">
+            <label>Category <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+              </div>
+              <select class="form-control selectpicker show-tick" name="category" required>
+                <option value="">- Category -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $category_id = $row['category_id'];
+                  $category_name = $row['category_name'];
+                ?>
+                  <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Description</label>
             <input type="text" class="form-control" name="description" placeholder="Product description">
diff --git a/db.sql b/db.sql
index 3508b177..c4dd27af 100644
--- a/db.sql
+++ b/db.sql
@@ -502,6 +502,7 @@ CREATE TABLE `products` (
   `product_cost` decimal(15,2) NOT NULL,
   `product_created_at` datetime NOT NULL,
   `product_updated_at` datetime DEFAULT NULL,
+  `category_id` int(11) NOT NULL,
   `company_id` int(11) NOT NULL,
   PRIMARY KEY (`product_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -818,4 +819,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-09-23 22:21:26
+-- Dump completed on 2019-09-28 14:15:08
diff --git a/edit_product_modal.php b/edit_product_modal.php
index a4d86407..e2165454 100644
--- a/edit_product_modal.php
+++ b/edit_product_modal.php
@@ -14,6 +14,30 @@
             <label>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" value="<?php echo $product_name; ?>" required>
           </div>
+          
+          <div class="form-group">
+            <label>Category <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+              </div>
+              <select class="form-control selectpicker show-tick" name="category" required>
+                <?php 
+                
+                $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
+                while($row = mysqli_fetch_array($sql_select)){
+                  $category_id_select = $row['category_id'];
+                  $category_name_select = $row['category_name'];
+                ?>
+                <option <?php if($category_id == $category_id_select){ ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+                <?php
+                }
+                
+                ?>
+              </select>
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Description</label>
             <input type="text" class="form-control" name="description" value="<?php echo $product_description; ?>">
diff --git a/post.php b/post.php
index 96de6027..a8ce5a9d 100644
--- a/post.php
+++ b/post.php
@@ -847,8 +847,9 @@ if(isset($_POST['add_product'])){
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
     $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
     $cost = floatval($_POST['cost']);
+    $category = intval($_POST['category']);
 
-    mysqli_query($mysqli,"INSERT INTO products SET product_name = '$name', product_description = '$description', product_cost = '$cost', product_created_at = NOW(), company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO products SET product_name = '$name', product_description = '$description', product_cost = '$cost', product_created_at = NOW(), category_id = $category, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Product', log_action = 'Created', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
@@ -865,8 +866,9 @@ if(isset($_POST['edit_product'])){
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
     $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
     $cost = floatval($_POST['cost']);
+    $category = intval($_POST['category']);
 
-    mysqli_query($mysqli,"UPDATE products SET product_name = '$name', product_description = '$description', product_cost = '$cost', product_updated_at = NOW() WHERE product_id = $product_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE products SET product_name = '$name', product_description = '$description', product_cost = '$cost', product_updated_at = NOW(), category_id = $category WHERE product_id = $product_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Product', log_action = 'Modified', log_description = '$name', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
diff --git a/products.php b/products.php
index 868aca48..5451af61 100644
--- a/products.php
+++ b/products.php
@@ -39,7 +39,7 @@
     $disp = "ASC";
   }
 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM products WHERE product_name LIKE '%$q%' AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to");
+  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM products, categories WHERE products.category_id = categories.category_id AND products.company_id = $session_company_id AND (product_name LIKE '%$q%' OR category_name LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to");
 
   $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   $total_found_rows = $num_rows[0];
@@ -68,6 +68,7 @@
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_name&o=<?php echo $disp; ?>">Name</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
             <th>Description</th>
             <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_cost&o=<?php echo $disp; ?>">Cost</a></th>
             <th class="text-center">Action</th>
@@ -81,10 +82,13 @@
             $product_name = $row['product_name'];
             $product_description = $row['product_description'];
             $product_cost = $row['product_cost'];
+            $category_id = $row['category_id'];
+            $category_name = $row['category_name'];
 
           ?>
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></td>
+            <td><?php echo $category_name; ?></td>
             <td><?php echo $product_description; ?></td>
             <td class="text-right text-monospace">$<?php echo number_format($product_cost,2); ?></td>
             <td>