diff --git a/Sofenggv2/src/controller/ManagerViewController.java b/Sofenggv2/src/controller/ManagerViewController.java
diff --git a/Sofenggv2/src/model/Database.java b/Sofenggv2/src/model/Database.java
@@ -11,7 +11,7 @@
 public class Database extends Model{
 	private final String directory = "jdbc:mysql://localhost:3306/autosupply?useSSL=false";
 	private final String user = "root";
-	private final String pass = "";
+	private final String pass = "1234";
 
 	private static Database instance = new Database();
 

diff --git a/Sofenggv2/src/model/ItemLog.java b/Sofenggv2/src/model/ItemLog.java
@@ -6,11 +6,10 @@ public class ItemLog {
 	public static final String TABLE = "items_log";
 	public static final String COLUMN_SALE_ID = "sale_id";
 	public static final String COLUMN_ITEM_CODE = "item_code";
-
 	public static final String COLUMN_TYPE = "type";
 	public static final String COLUMN_TRANSACTION_ID = "transaction_ID";
 	public static final String COLUMN_QUANTITY_SOLD = "quantity_sold";
-	public static final String COLUMN_ORIGINAL_SOLD = "original_price";
+	public static final String COLUMN_ORIGINAL_PRICE = "original_price";
 	public static final String COLUMN_PRICE_SOLD = "price_sold";
 
 	private String saleId;

diff --git a/Sofenggv2/src/model/ItemOrder.java b/Sofenggv2/src/model/ItemOrder.java
@@ -2,6 +2,7 @@
 
 public class ItemOrder {
 	public static final String TABLE = "items_orders";
+	public static final String COLUMN_ITEM_ORDER_ID = "item_order_id";
 	public static final String COLUMN_ORDER_ID = "order_id";
 	public static final String COLUMN_ITEM_CODE = "item_code";
 	public static final String COLUMN_QUANTITY = "quantity";

diff --git a/Sofenggv2/src/view/manager/ui/InventoryBanner.java b/Sofenggv2/src/view/manager/ui/InventoryBanner.java
@@ -1,6 +1,7 @@
 package view.manager.ui;
 
 import java.math.BigDecimal;
+import java.sql.Date;
 
 import controller.ManagerViewController;
 import javafx.geometry.Insets;
@@ -43,29 +44,40 @@ public InventoryBanner(ManagerViewController mvc) {
 
 	public void initHandler(){
 		editConfirmBtn.setOnAction(e -> {
-			String itemCode = itemCodeField.getText();
-			String supplierCode = supplierField.getText();
-			String description = ItemDescriptionField.getText();
-			BigDecimal unitPrice;
+			if(!itemCodeField.getText().equals("") && !nameField.getText().equals("") && !ItemDescriptionField.getText().equals("") &&
+			   !categoryField.getText().equals("") && !manufacturerField.getText().equals("") && !supplierField.getText().equals("") &&
+			   !stockField.getText().equals("") && datePurchasedField.getValue() != null && !unitPriceSupField.getText().equals("") && !unitPriceCustField.getText().equals("")){
+				String itemCode = itemCodeField.getText();
+				String name = nameField.getText();
+				String description = ItemDescriptionField.getText();
+				String category = categoryField.getText();
+				String manufacturer = manufacturerField.getText();
+				String supplierCode = supplierField.getText();
+				int stock = Integer.parseInt(stockField.getText());
+				Date datePurchase = java.sql.Date.valueOf(datePurchasedField.getValue());
+				BigDecimal priceSupplier = BigDecimal.valueOf(Double.parseDouble(unitPriceSupField.getText()));
+				BigDecimal priceCustomer = BigDecimal.valueOf(Double.parseDouble(unitPriceCustField.getText()));
 
-			try{
-				//XXX
-				//unitPrice = BigDecimal.valueOf(Double.parseDouble(unitPriceField.getText()));
-
-				if(!itemCode.equals("") && !supplierCode.equals("") && !description.equals("")){
-					//mvc.editItem(itemCode, description, supplierCode, unitPrice);
+				try{
+					mvc.editItem(itemCode, name, description, category, manufacturer, supplierCode, stock, datePurchase, priceSupplier, priceCustomer);
 					new AlertBoxPopup("Success", "Item updated.");
 					itemCodeField.setText("");
-					supplierField.setText("");
+					nameField.setText("");
 					ItemDescriptionField.setText("");
-					//unitPriceField.setText("");
-				}else{
-					new AlertBoxPopup("Input Error", "Some fields are left blank.");
+					categoryField.setText("");
+					manufacturerField.setText("");
+					supplierField.setText("");
+					stockField.setText("");
+					datePurchasedField.getEditor().clear();
+					datePurchasedField.setValue(null);
+					unitPriceSupField.setText("");
+					unitPriceCustField.setText("");
+				}catch(NumberFormatException nfe){
+					new AlertBoxPopup("Input Error", "Enter a valid number.");
 				}
-
-			}catch(NumberFormatException nfe){
-				new AlertBoxPopup("Input Error", "Enter a valid number.");
-			}
+			} else
+				new AlertBoxPopup("Input Error", "Some fields are left blank.");
+			mvc.getAllItems(new String[] {InventoryView.KEY});
 
 		});
 	}
@@ -128,7 +140,7 @@ private void initInventoryEdit() {
 		rightCombos[3] = new VBox();
 		datePurchasedField = new DatePicker();
 		rightCombos[3].getChildren().addAll(new Label("Date Purchased:"), datePurchasedField);
-
+		datePurchasedField.setValue(null);
 
 		/*Price selling Combination*/
 		rightCombos[4] = new VBox();
@@ -145,6 +157,7 @@ private void initInventoryEdit() {
 		bottom.getChildren().addAll(editConfirmBtn);
 	}
 
+	@SuppressWarnings("unused")
 	private void setPositions() {
 		setAlignment(editConfirmBtn, Pos.CENTER_RIGHT);
 		setMargin(editConfirmBtn, new Insets(0, 20, 20, 0));

diff --git a/Sofenggv2/src/view/manager/ui/InventoryView.java b/Sofenggv2/src/view/manager/ui/InventoryView.java
@@ -1,5 +1,6 @@
 package view.manager.ui;
 
+import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -16,6 +17,7 @@
 import javafx.util.Callback;
 import model.Database;
 import view.View;
+import view.cashier.AlertBoxPopup;
 
 public class InventoryView extends MainView implements View {
 	public static final String KEY = "managerinventoryviewkey";
@@ -44,7 +46,39 @@ public void init(){
 
 	public void initHandler(){
 		searchButton.setOnAction(e -> {
-			mvc.searchItem(new String[]{KEY}, searchField.getText());
+			try {
+				switch (searchColumns.getSelectionModel().getSelectedIndex()) {
+				case 0:
+					//transaction #
+					mvc.searchCurrentTransactionsByTransactionID(new String[] {KEY}, Integer.parseInt(searchField.getText()));
+					break;
+				case 1:
+					//user id
+					mvc.searchCurrentTransactionsByUserID(new String[] {KEY}, Integer.parseInt(searchField.getText()));
+					break;
+				case 2:
+					//transaction type
+					mvc.searchCurrentTransactionsByTransactionType(new String[] {KEY}, searchField.getText());
+					break;
+				case 3:
+					//is loan
+					mvc.searchCurrentTransactionsByIsLoan(new String[] {KEY}, Integer.parseInt(searchField.getText()));
+					break;
+				case 4:
+					//date sold
+					mvc.searchCurrentTransactionsByDateSold(new String[] {KEY}, searchField.getText());
+					break;
+				case 5:
+					//total cost
+					mvc.searchCurrentTransactionsByTotalPrice(new String[] {KEY}, BigDecimal.valueOf(Double.parseDouble(searchField.getText())));
+					break;
+				}
+			} catch (NumberFormatException nfe) {
+				if (searchField.getText().equals(""))
+ 					mvc.getCurrentTransactions(new String[] {KEY});
+ 				else
+ 					new AlertBoxPopup("Input Error", "Enter a number.");
+			}
 		});
 	}
 

diff --git a/Sofenggv2/src/view/manager/ui/TransactionView.java b/Sofenggv2/src/view/manager/ui/TransactionView.java
@@ -58,7 +58,7 @@ public void initHandler(){
 		searchButton.setOnAction(e -> {
 			try {
 				if (isToday) {
-					 					//monitor tab
+					//monitor tab
  					switch (searchColumns.getSelectionModel().getSelectedIndex()) {
  					case 0:
  						//transaction #