diff --git a/app/Http/Controllers/CustomAuthController.php b/app/Http/Controllers/CustomAuthController.php
index 2fc2994..0dc825c 100644
--- a/app/Http/Controllers/CustomAuthController.php
+++ b/app/Http/Controllers/CustomAuthController.php
@@ -19,6 +19,18 @@ class CustomAuthController extends Controller {
 		$password = $post['password'];
 
 		if (Auth::attempt(['email' => $email, 'password' => $password])){
+
+			if (Auth::user()->role == 'admin') {
+				$message = '
+				<div class="alert alert-danger alert-dismissible">
+					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+						<h4><i class="icon fa fa-ban"></i> ERROR:</h4>
+						You are not allowed to enter to this site.
+				</div>';
+				return response()->json(array('success' => false, 'message'=>$message));
+            }
+			
+			
 			$message = "success";
 			$navbar = view('layout.navbar', compact('view'))->render();
 			$save_design_button = ' <button type="button" class="btn btn-lg btn-primary pull-right" data-toggle="modal" data-target="#modalDesignName"><i class="fa fa-floppy-o" aria-hidden="true"></i> Save Design</button>';
diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index 6b02046..d41416f 100644
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -443,7 +443,7 @@ class TeamStoreController extends Controller {
 					'Quantity'		=> 1
 				);
 			}
-		}elseif($product_form == "name-size"){
+		}elseif($product_form == "name-size-form"){
 
 			$order_names =  $post['order_names'];
 			$order_size =  $post['order_size'];
diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php
index 5541430..18cec59 100644
--- a/resources/views/emails/orders.blade.php
+++ b/resources/views/emails/orders.blade.php
@@ -468,7 +468,14 @@
                                                         <th>Price</th>
                                                         <th>Quantity</th>
                                                       </tr>
-
+                                                    @elseif($item->FormUsed=="name-size-form")
+                                                      <tr>
+                                                          <th>Name</th>
+                                                          <th>Size</th>
+                                                          <th>Price</th>
+                                                          <th>Quantity</th>
+                                                          <th></th>
+                                                      </tr>
                                                     @else
 
 
@@ -531,6 +538,13 @@
                                                                 <td>{{ $sub_item->Price }}</td>
                                                                 <td>{{ $sub_item->Quantity }}</td>
                                                               </tr>
+                                                            @elseif($item->FormUsed=="name-size-form")
+                                                              <tr>
+                                                                <td>{{ $sub_item->Name }}</td>
+                                                                <td>{{ $sub_item->Size }}</td>
+                                                                <td>{{ $sub_item->Price }}</td>
+                                                                <td>{{ $sub_item->Quantity }}</td>
+                                                              </tr>
                                                             @else
 
                                                             @endif
diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php
index 7e4c23b..69f96be 100644
--- a/resources/views/sublayouts/cart.blade.php
+++ b/resources/views/sublayouts/cart.blade.php
@@ -172,7 +172,14 @@
                                             <th>Quantity</th>
                                             <th></th>
                                         </tr>
-
+                                    @elseif($item->FormUsed=="name-size-form")
+                                        <tr>
+                                            <th>Name</th>
+                                            <th>Size</th>
+                                            <th>Price</th>
+                                            <th>Quantity</th>
+                                            <th></th>
+                                        </tr>
                                     @else
 
                                     @endif
@@ -237,6 +244,14 @@
                                                     <td>{{ $sub_item->Quantity }}</td>
                                                     <td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><span class="glyphicon glyphicon-remove"></span></a></td>
                                                 </tr>
+                                            @elseif($item->FormUsed=="name-size-form")
+                                                <tr>
+                                                    <td>{{ $sub_item->Name }}</td>
+                                                    <td>{{ $sub_item->Size }}</td>
+                                                    <td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
+                                                    <td>{{ $sub_item->Quantity }}</td>
+                                                    <td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><span class="glyphicon glyphicon-remove"></span></a></td>
+                                                </tr>
                                             @else
 
                                             @endif
diff --git a/resources/views/teamstore-sublayouts/forms/name-size.blade.php b/resources/views/teamstore-sublayouts/forms/name-size-form.blade.php
similarity index 100%
rename from resources/views/teamstore-sublayouts/forms/name-size.blade.php
rename to resources/views/teamstore-sublayouts/forms/name-size-form.blade.php
diff --git a/resources/views/user-layouts/add_item.blade.php b/resources/views/user-layouts/add_item.blade.php
index 8bdd0e8..d5a2014 100644
--- a/resources/views/user-layouts/add_item.blade.php
+++ b/resources/views/user-layouts/add_item.blade.php
@@ -99,6 +99,7 @@
                                                 <option value="name-number-form">Name and Number Form</option>
                                                 <option value="name-number-size-form">Name, Number and Size Form</option>
                                                 <option value="number-form">Number Only Form</option>
+                                                <option value="name-size-form">Number and Size Form</option>
                                             </select>
                                         </div>
                                         <div class="form-group">
diff --git a/resources/views/user-layouts/order_details.blade.php b/resources/views/user-layouts/order_details.blade.php
index 09e802c..037d259 100644
--- a/resources/views/user-layouts/order_details.blade.php
+++ b/resources/views/user-layouts/order_details.blade.php
@@ -150,6 +150,14 @@
                                                                         <th>Price</th>
                                                                         <th>Quantity</th>
                                                                     </tr>
+                                                                @elseif($item->FormUsed=="name-size-form")
+                                                                    <tr>
+                                                                        <th>Name</th>
+                                                                        <th>Size</th>
+                                                                        <th>Price</th>
+                                                                        <th>Quantity</th>
+                                                                        <th></th>
+                                                                    </tr>
                                                                 @else
 
                                                                 @endif
@@ -203,6 +211,14 @@
                                                                                 <td>{{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
                                                                                 <td>{{ $sub_item->Quantity }}</td>
                                                                             </tr>
+                                                                        
+                                                                        @elseif($item->FormUsed=="name-size-form")
+                                                                            <tr>
+                                                                              <td>{{ $sub_item->Name }}</td>
+                                                                              <td>{{ $sub_item->Size }}</td>
+                                                                              <td>{{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
+                                                                              <td>{{ $sub_item->Quantity }}</td>
+                                                                            </tr>
                                                                         @else
 
                                                                         @endif
diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php
index 4431a74..8c59467 100644
--- a/resources/views/user-layouts/user_template.blade.php
+++ b/resources/views/user-layouts/user_template.blade.php
@@ -586,8 +586,6 @@
 
 		<!-- jQuery 2.2.3 -->
 		<script src="{{asset('/public/bower_components/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js')}}"></script>
-		<!-- jQuery UI 1.11.4 -->
-		<script src="https://code.jquery.com/ui/1.10.4/jquery-ui.min.js"></script>
 		<!-- Bootstrap 3.3.6 -->
 		<script src="{{asset('/public/bower_components/AdminLTE/bootstrap/js/bootstrap.min.js')}}"></script>
 
@@ -615,8 +613,6 @@
 		<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
 		<!-- \priceformat -->
 		<script src="{{asset('/public/designer/js/jquery.priceformat.min.js')}}"></script>
-		<!-- jquery-ui js -->
-		<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
 		<!-- ekko-lightbox -->
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.3.0/ekko-lightbox.js"></script>
 		<!-- bootstrap-toggle -->
diff --git a/resources/views/user-layouts/view-store-item.blade.php b/resources/views/user-layouts/view-store-item.blade.php
index f68b848..87b456c 100644
--- a/resources/views/user-layouts/view-store-item.blade.php
+++ b/resources/views/user-layouts/view-store-item.blade.php
@@ -126,6 +126,7 @@
                                                 <option value="name-number-form" @if($product_array[0]->ProductForm == "name-number-form") selected  @endif>Name and Number Form</option>
                                                 <option value="name-number-size-form" @if($product_array[0]->ProductForm == "name-number-size-form") selected  @endif>Name, Number and Size Form</option>
                                                 <option value="number-form" @if($product_array[0]->ProductForm == "number-form") selected  @endif>Number Only Form</option>
+                                                <option value="name-size-form" @if($product_array[0]->ProductForm == "name-size-form") selected  @endif>Number and Size Form</option>
                                             </select>
                                         </div>
                                         <div class="form-group">