diff --git a/front-api/app.rb b/front-api/app.rb
index 28f7a94..5a6bb2a 100644
--- a/front-api/app.rb
+++ b/front-api/app.rb
@@ -16,7 +16,8 @@ before do
   content_type :json
   # TODO: before running to production change this so that only specific
   #       domain is allowed
-  headers 'Access-Control-Allow-Origin' => 'http://192.168.1.35:3001',
+
+  headers 'Access-Control-Allow-Origin' => 'http://localhost:3001',
     'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST','PUT'],
     'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept',
     'Access-Control-Expose-Headers' => 'X-Total-Count',
diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb
index 514b2e7..9118b32 100644
--- a/front-api/db/schema.rb
+++ b/front-api/db/schema.rb
@@ -130,8 +130,8 @@ ActiveRecord::Schema.define(version: 20150614050336) do
     t.datetime "updated_at",                                                     null: false
     t.string   "tags"
     t.json     "traits"
-    t.integer  "supplier_id"
     t.decimal  "weight",                                 precision: 5, scale: 3
+    t.integer  "supplier_id"
     t.integer  "delivery_time_estimation_id"
     t.integer  "brand_id"
   end
diff --git a/front-ui/.gitignore b/front-ui/.gitignore
index d3585cc..8797cab 100644
--- a/front-ui/.gitignore
+++ b/front-ui/.gitignore
@@ -18,6 +18,8 @@ coverage
 
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
+build/**/*.js
+build/**/*.css
 build/*.js
 build/*.css
 
diff --git a/front-ui/Gruntfile.js b/front-ui/Gruntfile.js
index 4f82651..1a4e996 100644
--- a/front-ui/Gruntfile.js
+++ b/front-ui/Gruntfile.js
@@ -1,7 +1,7 @@
 module.exports = function(grunt) {
     grunt.initConfig({
         browserify: {
-            basic: {
+            dev: {
                 src: ['app/ribica.js'],
                 dest: 'build/ribica.bundle.js',
                 options: {
@@ -12,7 +12,16 @@ module.exports = function(grunt) {
                     },
                     watch: true
                 }
-
+            },
+            prod: {
+                src: ['app/ribica.js'],
+                dest: 'build/ribica.bundle.js',
+                options: {
+                    transform: ['reactify'],
+                    browserifyOptions: {
+                        standalone: 'RIBICA'
+                    }
+                }
             }
         },
         watch: {
@@ -39,7 +48,7 @@ module.exports = function(grunt) {
         uglify: {
             my_target: {
                 files: {
-                    'build/ribica.min.js': ['build/ribica.js']
+                    'build/ribica.js': ['build/ribica.js']
                 }
             }
         },
@@ -47,7 +56,8 @@ module.exports = function(grunt) {
             dev: {
                 options: {
                     variables: {
-                        apiEndpoint: 'http://192.168.1.35:4567'
+                        apiEndpoint: 'http://localhost:4567'
+
                     }
                 }
             },
@@ -103,7 +113,7 @@ module.exports = function(grunt) {
     grunt.registerTask('default', []);
     grunt.registerTask('config-dev', ['config:dev', 'replace']);
     grunt.registerTask('config-prod', ['config:prod', 'replace']);
-    grunt.registerTask('dev', ['browserify', 'config-dev', 'concat:css', 'concat:js', 'connect:server:keepalive']);
-    grunt.registerTask('build', ['browserify', 'config-prod', 'concat:css', 'concat:js']);
+    grunt.registerTask('dev', ['browserify:dev', 'config-dev', 'concat:css', 'concat:js', 'connect:server:keepalive']);
+    grunt.registerTask('build', ['browserify:prod', 'config-prod', 'concat:css', 'concat:js', 'uglify']);
 
 };