diff --git a/database.mwb b/database.mwb
index fb8479e..567965d 100644
Binary files a/database.mwb and b/database.mwb differ
diff --git a/database.sql b/database.sql
index 14196f7..0d30dd3 100644
--- a/database.sql
+++ b/database.sql
@@ -1,5 +1,5 @@
 -- MySQL Script generated by MySQL Workbench
--- Sat 22 Sep 2018 02:40:11 AM MDT
+-- Tue 10 Mar 2020 08:54:46 EET
 -- Model: New Model    Version: 1.0
 -- MySQL Workbench Forward Engineering
 
@@ -55,14 +55,14 @@ CREATE TABLE IF NOT EXISTS `items` (
   `price` DECIMAL(10,2) NULL,
   PRIMARY KEY (`itemid`),
   INDEX `fk_items_categories_idx` (`catid` ASC),
-  INDEX `fk_items_locations1_idx` (`locid` ASC),
+  INDEX `fk_items_locations_idx` (`locid` ASC),
   UNIQUE INDEX `itemid_UNIQUE` (`itemid` ASC),
   CONSTRAINT `fk_items_categories`
     FOREIGN KEY (`catid`)
     REFERENCES `categories` (`catid`)
     ON DELETE NO ACTION
     ON UPDATE NO ACTION,
-  CONSTRAINT `fk_items_locations1`
+  CONSTRAINT `fk_items_locations`
     FOREIGN KEY (`locid`)
     REFERENCES `locations` (`locid`)
     ON DELETE NO ACTION
@@ -70,27 +70,6 @@ CREATE TABLE IF NOT EXISTS `items` (
 ENGINE = InnoDB;
 
 
--- -----------------------------------------------------
--- Table `stock`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `stock` (
-  `stockid` INT NOT NULL AUTO_INCREMENT,
-  `timestamp` TIMESTAMP,
-  `itemid` INT NOT NULL,
-  `stock` INT NOT NULL,
-  `text1` TEXT(500) NOT NULL,
-  `userid` INT NOT NULL,
-  PRIMARY KEY (`stockid`),
-  -- INDEX `fk_items_stock_idx` (`stockid` ASC),
-  UNIQUE INDEX `stockid_UNIQUE` (`stockid` ASC),
-  CONSTRAINT `fk_items_stock`
-    FOREIGN KEY (`itemid`)
-    REFERENCES `items` (`itemid`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB;
-
-
 -- -----------------------------------------------------
 -- Table `labels`
 -- -----------------------------------------------------
@@ -110,8 +89,8 @@ CREATE TABLE IF NOT EXISTS `permissions` (
   `itemid` INT NOT NULL,
   `canedit` TINYINT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`userid`, `itemid`),
-  INDEX `fk_permissions_items1_idx` (`itemid` ASC),
-  CONSTRAINT `fk_permissions_items1`
+  INDEX `fk_permissions_items_idx` (`itemid` ASC),
+  CONSTRAINT `fk_permissions_items`
     FOREIGN KEY (`itemid`)
     REFERENCES `items` (`itemid`)
     ON DELETE NO ACTION
@@ -141,8 +120,29 @@ CREATE TABLE IF NOT EXISTS `images` (
   `primary` TINYINT(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`imageid`, `itemid`),
   UNIQUE INDEX `imageid_UNIQUE` (`imageid` ASC),
-  INDEX `fk_images_items1_idx` (`itemid` ASC),
-  CONSTRAINT `fk_images_items1`
+  INDEX `fk_images_items_idx` (`itemid` ASC),
+  CONSTRAINT `fk_images_items`
+    FOREIGN KEY (`itemid`)
+    REFERENCES `items` (`itemid`)
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `stock`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `stock` (
+  `stockid` INT NOT NULL AUTO_INCREMENT,
+  `itemid` INT NOT NULL,
+  `stock` INT NOT NULL,
+  `text1` TEXT(500) NOT NULL,
+  `userid` INT NOT NULL,
+  `timestamp` TIMESTAMP NOT NULL,
+  PRIMARY KEY (`stockid`, `itemid`),
+  UNIQUE INDEX `stockid_UNIQUE` (`stockid` ASC),
+  INDEX `fk_stock_items_idx` (`itemid` ASC),
+  CONSTRAINT `fk_stock_items`
     FOREIGN KEY (`itemid`)
     REFERENCES `items` (`itemid`)
     ON DELETE NO ACTION
@@ -169,3 +169,4 @@ INSERT INTO `labels` (`rowid`, `name`, `value`) VALUES (8, 'itemtext3', 'Text Va
 INSERT INTO `labels` (`rowid`, `name`, `value`) VALUES (9, 'catname', 'Category Name');
 
 COMMIT;
+