diff --git a/src/app.js b/src/app.js
index ccaae9f4..df636c09 100644
--- a/src/app.js
+++ b/src/app.js
@@ -9,6 +9,7 @@ import {HttpModule} from '@angular/http';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 
+
 import 'core-js';
 import 'babel-polyfill';
 import 'zone.js';
diff --git a/src/components/schema/edge/newEdgeModal.html b/src/components/schema/edge/newEdgeModal.html
index fc20939f..369dc09b 100644
--- a/src/components/schema/edge/newEdgeModal.html
+++ b/src/components/schema/edge/newEdgeModal.html
@@ -81,10 +81,19 @@ <h4 class="modal-title">Edge Class: {{$ctrl.property['name']}}</h4>
               </div>
             </div>
 
-            <div class="form-group">
-              <label class="control-label col-md-3"> Number of Clusters</label>
-              <div class="col-md-9">
-                <input type="number" class="form-control" ng-model="$ctrl.property['clusters']"/>
+            <div class="form-group"
+                 ng-class="{ 'has-error' : (classForm.clusterNumber.$error.min || classForm.clusterNumber.$error.number)}">
+              <label class="control-label col-md-2"> Number of Clusters</label>
+              <div class="col-md-10">
+                <input type="number" name="clusterNumber" min="1" class="form-control"
+                       ng-model="$ctrl.property['clusters']"/>
+              </div>
+              <div class="col-md-10 col-md-offset-2">
+                <span ng-show="classForm.clusterNumber.$error.min"
+                      class="help-block help-block-sm ">Number of clusters should be >= 1</span>
+
+                <span ng-show="classForm.clusterNumber.$error.number"
+                      class="help-block help-block-sm ">Invalid Number</span>
               </div>
             </div>
           </form>
diff --git a/src/components/schema/generic/newGenericModal.html b/src/components/schema/generic/newGenericModal.html
index d82e5122..12c8be09 100644
--- a/src/components/schema/generic/newGenericModal.html
+++ b/src/components/schema/generic/newGenericModal.html
@@ -53,10 +53,19 @@ <h4 class="modal-title">Generic Class: {{$ctrl.property['name']}}</h4>
               </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group"
+                 ng-class="{ 'has-error' : (classForm.clusterNumber.$error.min || classForm.clusterNumber.$error.number)}">
               <label class="control-label col-md-2"> Number of Clusters</label>
               <div class="col-md-10">
-                <input type="number" class="form-control" ng-model="$ctrl.property['clusters']"/>
+                <input type="number" name="clusterNumber" min="1" class="form-control"
+                       ng-model="$ctrl.property['clusters']"/>
+              </div>
+              <div class="col-md-10 col-md-offset-2">
+                <span ng-show="classForm.clusterNumber.$error.min"
+                      class="help-block help-block-sm ">Number of clusters should be >= 1</span>
+
+                <span ng-show="classForm.clusterNumber.$error.number"
+                      class="help-block help-block-sm ">Invalid Number</span>
               </div>
             </div>
           </form>
diff --git a/src/components/schema/vertex/newVertexModal.html b/src/components/schema/vertex/newVertexModal.html
index f0981bf8..83f22dc6 100644
--- a/src/components/schema/vertex/newVertexModal.html
+++ b/src/components/schema/vertex/newVertexModal.html
@@ -56,10 +56,19 @@ <h4 class="modal-title">Vertex Class: {{$ctrl.property['name']}}</h4>
               </div>
             </div>
 
-            <div class="form-group">
+            <div class="form-group"
+                 ng-class="{ 'has-error' : (classForm.clusterNumber.$error.min || classForm.clusterNumber.$error.number)}">
               <label class="control-label col-md-2"> Number of Clusters</label>
               <div class="col-md-10">
-                <input type="number" class="form-control" ng-model="$ctrl.property['clusters']"/>
+                <input type="number" name="clusterNumber" min="1" class="form-control"
+                       ng-model="$ctrl.property['clusters']"/>
+              </div>
+              <div class="col-md-10 col-md-offset-2">
+                <span ng-show="classForm.clusterNumber.$error.min"
+                      class="help-block help-block-sm ">Number of clusters should be >= 1</span>
+
+                <span ng-show="classForm.clusterNumber.$error.number"
+                      class="help-block help-block-sm ">Invalid Number</span>
               </div>
             </div>
           </form>
diff --git a/webpack.config.js b/webpack.config.js
index 10fd145e..6c684f98 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -44,7 +44,7 @@ module.exports = {
         loader: "style-loader!css-loader"
       },
       {
-        test: /\.(eot|svg|ttf|gif|woff(2)?)(\?v=\d+\.\d+\.\d+)?/,
+        test: /\.(eot|svg|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/,
         loader: 'url-loader'
       },
       {