diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index cc9377da..7107ea29 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -73,7 +73,7 @@ class AssetTableField extends ComplexTableField {
 				)
 			)
 		);
-		
+				
 		if(is_a($childData,'Image')) {
 			$big = $childData->URL;
 			$thumbnail = $childData->getFormattedImage('AssetLibraryPreview')->URL;
@@ -92,8 +92,37 @@ class AssetTableField extends ComplexTableField {
 				),
 				'Main'
 			);
+			
+			$detailFormFields->addFieldToTab("BottomRoot", 
+				new Tab("Gallery Options",
+					new TextField( "Content", "Caption" )
+				)
+			);
 		}
-		
+		else {
+			if( $childData->Extension == 'swf' ) {
+				$detailFormFields->addFieldToTab("BottomRoot", 
+					new Tab("Gallery Options",
+						new TextField( "Content", "Caption" ),
+						new TextField( 'PopupWidth', 'Popup Width' ),
+						new TextField( 'PopupHeight', 'Popup Height' ),
+						new HeaderField( 'SWF File Options' ),
+						new CheckboxField( 'Embed', 'Force Embeding' ),
+						new CheckboxField( 'LimitDimensions', 'Limit The Dimensions In The Popup Window' )
+					)
+				);
+			}
+			else {
+				$detailFormFields->addFieldToTab("BottomRoot", 
+					new Tab("Gallery Options",
+						new TextField( "Content", "Caption" ),
+						new TextField( 'PopupWidth', 'Popup Width' ),
+						new TextField( 'PopupHeight', 'Popup Height' )
+					)
+				);
+			}
+		}
+						
 		if($childData && $childData->hasMethod('BackLinkTracking')) {
 			$links = $childData->BackLinkTracking();
 			if($links->exists()) {