diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 54b1996e..8e3ede95 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -86,6 +86,28 @@ $(document).ready(function() {
       }
   });
 
+  // Image Upload
+  $("#set_menu_item_image_path").fileinput({
+      previewFileType: "image",
+      allowedFileExtensions: ["jpg", "gif", "png"],
+      browseClass: "btn btn-success",
+      browseLabel: "Pick Image",
+      browseIcon: "<i class=\"fa fa-image\"></i> ",
+      removeClass: "btn btn-danger",
+      removeLabel: "Delete",
+      removeIcon: "<i class=\"fa fa-trash\"></i> ",
+      showUpload: false,
+      // uploadClass: "btn btn-info",
+      // uploadLabel: "Upload",
+      // uploadIcon: "<i class=\"fa fa-upload\"></i> ",
+      previewTemplates: {
+        image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
+                '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
+                '</div>\n',
+      }
+  });
+
+
   $("#product_image_path").fileinput({
       previewFileType: "image",
       allowedFileExtensions: ["jpg", "gif", "png"],
diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb
index fdf63f8d..5e1016a6 100755
--- a/app/uploaders/menu_item_image_uploader.rb
+++ b/app/uploaders/menu_item_image_uploader.rb
@@ -15,7 +15,7 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "image/menu_images"
+    "image/menu_images/#{Shop.find(1).shop_code}"
     # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
index d31389e1..89e6aa58 100755
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -53,8 +53,8 @@ json.id           item.id
 json.code    item.item_code
 json.name         item.name
 json.alt_name     item.alt_name
-if !request_url.nil? && request_url != '' && !item.image_path.url.nil?
-  json.image        request_url + item.image_path.url.to_s
+if !request_url.nil? && request_url != '' && !item.image_path.nil?
+  json.image        request_url + item.image_path.to_s
 else
   json.image        item.image_path.url
 end
diff --git a/public/image/product_images/19403447_1137374939742115_1285237333_o.jpg b/public/image/product_images/19403447_1137374939742115_1285237333_o.jpg
deleted file mode 100755
index da3d4eae..00000000
Binary files a/public/image/product_images/19403447_1137374939742115_1285237333_o.jpg and /dev/null differ
diff --git a/public/image/product_images/Screenshot_from_2017-08-21_11-56-42.png b/public/image/product_images/Screenshot_from_2017-08-21_11-56-42.png
deleted file mode 100755
index 646573fd..00000000
Binary files a/public/image/product_images/Screenshot_from_2017-08-21_11-56-42.png and /dev/null differ
diff --git a/public/image/product_images/Screenshot_from_2017-08-21_11-57-41.png b/public/image/product_images/Screenshot_from_2017-08-21_11-57-41.png
deleted file mode 100755
index 4a9bff39..00000000
Binary files a/public/image/product_images/Screenshot_from_2017-08-21_11-57-41.png and /dev/null differ