diff --git a/upload/admin_area/styles/cbv2/layout/edit_video.html b/upload/admin_area/styles/cbv2/layout/edit_video.html
index 88ba653b..4aabd473 100644
--- a/upload/admin_area/styles/cbv2/layout/edit_video.html
+++ b/upload/admin_area/styles/cbv2/layout/edit_video.html
@@ -1,10 +1,6 @@
-{assign var='requiredFields' value=$Upload->loadRequiredFields($data)}
-{assign var='optionFields' value=$Upload->loadOptionFields($data)}
-{assign var='locationFields' value=$Upload->loadLocationFields($data)}
-
-{assign var='custom_fields' value=$Upload->load_custom_upload_fields($data,TRUE)}
-{assign var='custom_form_fields' value=$Upload->load_custom_form_fields($data,TRUE)}
 
+{assign var='custom_upload_fields' value=$Upload->load_custom_upload_fields($data,TRUE)}
+{assign var='video_fields' value=$Upload->load_video_fields($data)}
 
 {if $data.title neq ""}
 
@@ -105,12 +101,6 @@
     </tr>
     
     {foreach from=$requiredFields item=field}
-  <tr>
-    <td width="200" ><strong>{$field.title} :</strong></td>
-    <td >{$field.hint_1}<br />
-      {$formObj->createField($field)} 
-{$field.hint_2}</td>
-  </tr>
   {/foreach}
   
     <tr>
@@ -153,6 +143,19 @@ seconds</td>
   </tr>
   </table>
 </fieldset>
+<fieldset class="fieldset">
+  <legend>Custom Upload Fields</legend>
+  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="block">
+      {foreach from=$custom_upload_fields item=field}
+  <tr>
+    <td width="200"><strong>{$field.title}</strong></td>
+    <td>{$field.hint_1}{ANCHOR place=$field.anchor_before}{$formObj->createField($field)}
+                    <br>
+      {$field.hint_2}</td>
+  </tr>
+  {/foreach}
+  </table>
+</fieldset>
 
 
 
@@ -183,66 +186,21 @@ seconds</td>
 
     </div>
     
-    
+    {foreach from=$video_fields item=field_group}
     <fieldset class="fieldset">
-  <legend>Recording Details</legend>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="block">
-   {foreach from=$locationFields item=field}
-                  <tr>
-                    <td width="200"><strong>{$field.title} </strong></td>
-                    <td >{$field.hint_1}{$formObj->createField($field)} 
-{$field.hint_2}</td>
-    </tr>
-                {/foreach}
-  </table>
-</fieldset>
-
-
-<fieldset class="fieldset">
-  <legend>Custom Form Fields</legend>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="block">
-      {foreach from=$custom_form_fields item=field}
-  <tr>
-    <td width="200"><strong>{$field.title}</strong></td>
-    <td>{$field.hint_1}{ANCHOR place=$field.anchor_before}{$formObj->createField($field)}
-                    <br>
-      {$field.hint_2}</td>
-  </tr>
-  {/foreach}
-  </table>
-</fieldset>
-
-
-
-<fieldset class="fieldset">
-  <legend>Sharing</legend>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="block">
-      {foreach from=$optionFields item=field}
-  <tr>
-    <td width="200"><strong>{$field.title} </strong></td>
-    <td>{$field.hint_1}{ANCHOR place=$field.anchor_before}{$formObj->createField($field)}
-                    <br>
-      {$field.hint_2}</td>
-  </tr>
-  {/foreach}
-  </table>
-</fieldset>
-
-
-<fieldset class="fieldset">
-  <legend>Custom Upload Fields</legend>
-  <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="block">
-      {foreach from=$custom_fields item=field}
-  <tr>
-    <td width="200"><strong>{$field.title}</strong></td>
-    <td>{$field.hint_1}{ANCHOR place=$field.anchor_before}{$formObj->createField($field)}
-                    <br>
-      {$field.hint_2}</td>
-  </tr>
-  {/foreach}
-  </table>
-</fieldset>
-
+        <legend>{$field_group.group_name}</legend>
+        <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" class="block">
+            {foreach from=$field_group.fields item=field}
+                <tr>
+                	<td width="200"><strong>{$field.title} </strong></td>
+                	<td >{$field.hint_1}{$formObj->createField($field)}{$field.hint_2}</td>
+                </tr>
+            {/foreach}
+        </table>
+    </fieldset>
+	{/foreach}
+    
+    
 </td>
   </tr>
   <tr>
diff --git a/upload/includes/classes/form.class.php b/upload/includes/classes/form.class.php
index 60f7d79a..31ba4baf 100644
--- a/upload/includes/classes/form.class.php
+++ b/upload/includes/classes/form.class.php
@@ -55,6 +55,7 @@ class formObj
 	*/
 	function createTextfield($field,$multi=FALSE)
 	{
+
 		//Starting Text Field
 		if($field['type']=='textfield')
 			$textField = '<input type="text"';
diff --git a/upload/includes/classes/video.class.php b/upload/includes/classes/video.class.php
index 359d39b9..b6797f71 100644
--- a/upload/includes/classes/video.class.php
+++ b/upload/includes/classes/video.class.php
@@ -949,13 +949,13 @@ class CBvideo extends CBCategory
 		global $db,$LANG;
 		$num = get_thumb_num($thumb);
 		$file = THUMBS_DIR.'/'.$thumb;
-		if(file_exists($file))
-		{
+		//if(file_exists($file))
+		//{
 			$db->update(tbl("video"),array("default_thumb"),array($num)," videoid='$vid'");
 			e(lang('vid_thumb_changed'),'m');
-		}else{
-			e(lang('vid_thumb_change_err'));
-		}
+		//}else{
+		//	e(lang('vid_thumb_change_err'));
+		//}
 	}