diff --git a/e107_admin/image.php b/e107_admin/image.php
index bbe4a1f5e..a936f1a37 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -276,7 +276,7 @@ class media_cat_ui extends e_admin_ui
 
 
 	
-	public function beforeCreate($new_data)
+	public function beforeCreate($new_data, $old_data)
 	{
 		// XXX temporary disable when there is no owners, discuss
 		if(!$new_data['media_cat_owner'])
@@ -1583,13 +1583,13 @@ class media_admin_ui extends e_admin_ui
 
 		}
 			
-
+/*
 		if($this->getQuery('audio') || $this->getQuery('bbcode') == 'audio')
 		{
 				$text .= "<div class='tab-pane clearfix {$videoActive}' id='core-media-audio' >";
 				$text .= $this->audioTab();
 				$text .= "</div>";
-		}
+		}*/
 
 		if($this->getQuery('glyphs') == 1 || $this->getQuery('bbcode') == 'glyph')
 		{
@@ -1832,10 +1832,16 @@ class media_admin_ui extends e_admin_ui
 			'perPage'	=> 8,
 			'gridClass'	=> 'col-sm-3 media-carousel-item-image',
 			'bbcode'	=> 'img', // bbcode tag.
-			'close'		=> 'true'
-
 		);
 
+		$close = true;
+
+		if(!empty($option['bbcode']))
+		{
+			$close = false;
+		}
+
+
 		$items = array();
 
 		$frm 		= !empty($option['from']) ? $option['from'] : 0;
@@ -1855,14 +1861,15 @@ class media_admin_ui extends e_admin_ui
 		{
 			$items[] = array(
 					'previewHtml'	=> $tp->toImage($val['media_url'], array('w'=>210, 'h'=>140)),
-				//	'previewUrl'    => $tp->thumbUrl($val['media_url'], array('w'=>210, 'h'=>140)),
+					'previewUrl'    => $tp->thumbUrl($val['media_url'], array('w'=>210, 'h'=>140)),
 					'saveValue'		=> $val['media_url'],
 					'thumbUrl'		=> $tp->thumbUrl($val['media_url'], array('w'=>340, 'h'=>220)),
 					'title'			=> $val['media_name'],
 					'tooltip'       => basename($val['media_url'])." (".$val['media_dimensions'].")",
 					'slideCaption'	=> '',
 					'slideCategory'	=> 'bootstrap',
-					'mime'          => $val['media_type']
+					'mime'          => $val['media_type'],
+					'close'         => $close
 			);
 
 		}
@@ -2701,6 +2708,7 @@ class media_admin_ui extends e_admin_ui
 			$text .= "<div  id='core-image-show-avatars' class='row'>";
 
 			$count = 0;
+			$prevType  = '';
 			while (list($key, $image_name) = each($dirlist))
 			{
 				//$users = IMALAN_21." | ";
@@ -2831,7 +2839,7 @@ class media_admin_ui extends e_admin_ui
 	 * Invoked just before item create event
 	 * @return array
 	 */
-	public function beforeCreate($new_data)
+	public function beforeCreate($new_data, $old_data)
 	{
 		// print_a($_POST);
 		// return data to be merged with posted model data
@@ -3007,7 +3015,7 @@ class media_admin_ui extends e_admin_ui
 		return true;
 	}
 
-	function afterDelete($deleted_data, $id) // call after 'delete' is successfully executed. - delete the file with the db record (optional pref)
+	function afterDelete($deleted_data, $id, $deleted_check) // call after 'delete' is successfully executed. - delete the file with the db record (optional pref)
 	{
 
 		if(!empty($deleted_data['media_url']))
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index 0a00b758e..d2f7e832e 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -1364,8 +1364,17 @@ class e_media
 
 	private function browserCarouselItemSelector($data)
 	{
-		$close  = (E107_DEBUG_LEVEL > 0) ? "" : "  data-close='true' ";	//
-		$select = (E107_DEBUG_LEVEL > 0) ? '' : " e-dialog-save e-dialog-close";
+	//	$close  = (E107_DEBUG_LEVEL > 0) ? "" : "  data-close='true' ";	//
+	//	$select = (E107_DEBUG_LEVEL > 0) ? '' : " ";
+		$close = '';
+		$select = '';
+
+		if(!empty($data['close']) && E107_DEBUG_LEVEL < 1)
+		{
+			$select .= " e-dialog-save e-dialog-close";
+			$close = "  data-close='true' ";
+		}
+
 		$style  = varset($data['style'],'');
 		$class  = varset($data['class'],'');
 		$dataPreview = !empty($data['previewHtml']) ? base64_encode($data['previewHtml']) : '';
@@ -1397,6 +1406,7 @@ class e_media
 			'gridClass'		=> 'span2 col-md-2',
 			'bbcode'		=> '',
 			'tooltip'       => '',
+			'close'         => true // close modal window after item selected
 			
 		);
 		
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 9b5c49aa0..8b74e7fa7 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -290,6 +290,7 @@ td.right, th.right 			{ text-align:right }
 
 .mediaselector-preview video { position: absolute; top: 0; }
 .mediaselector-preview audio { height: 70px }
+.mediaselector-preview img { max-height: 100%; width: auto; margin-left: auto; margin-right: auto; }
 .mediaselector-preview  i   { /*padding: 20% 40%;*/ }
 
 .mediaselector-container .overlay {
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index 93985f725..02e1bea7d 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -411,6 +411,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 			}
 
 			preview = atob(previewHTML).trim();
+			e107.mediaManager.eMediaAttribute($this, bbcode);
 		}
 		else if(type === 'glyph')
 		{