diff --git a/TODO.todo b/TODO.todo
index 7a8e835c53..d5e876e3bf 100644
--- a/TODO.todo
+++ b/TODO.todo
@@ -2,7 +2,6 @@
 
 neuro for 6.0.10:
   Editor:
-  - Add the media back into the editor.
   - Fix pagination display
 
   Typogarden:
diff --git a/app/helpers/admin/base_helper.rb b/app/helpers/admin/base_helper.rb
index e3a184c46d..00192e723d 100644
--- a/app/helpers/admin/base_helper.rb
+++ b/app/helpers/admin/base_helper.rb
@@ -250,9 +250,10 @@ def show_thumbnail_for_editor(image)
     # If something went wrong with thumbnail generation, we just display a place holder
     thumbnail = (File.exists? thumb) ? "#{this_blog.base_url}/files/thumb_#{image.filename}" : "#{this_blog.base_url}/images/thumb_blank.jpg"
 
-    picture = "<img class='tumb' src='#{thumbnail}' "
-    picture << "alt='#{this_blog.base_url}/files/#{image.filename}' "
-    picture << " onclick=\"edInsertImageFromCarousel('article_body_and_extended', '#{this_blog.base_url}/files/#{image.filename}');\" />"
+    picture = "<a onclick=\"edInsertImageFromCarousel('article_body_and_extended', '#{this_blog.base_url}/files/#{image.filename}');\" />"
+    picture << "<img class='tumb' src='#{thumbnail}' "
+    picture << "alt='#{this_blog.base_url}/files/#{image.filename}' />"
+    picture << "</a>"
     return picture
   end
 
diff --git a/app/views/admin/content/_form.html.erb b/app/views/admin/content/_form.html.erb
index e24991d5e6..d88451ed01 100644
--- a/app/views/admin/content/_form.html.erb
+++ b/app/views/admin/content/_form.html.erb
@@ -99,7 +99,7 @@
       <%= text_field 'article', 'title', :class => 'span1', :style => ' width: 99%', :placeholder => _('Title') %>
     </div>
 
-    <%#= render('images', { :images => @images}) unless @images.empty? %>
+    <%= render('images', { :images => @images}) unless @images.empty? %>
 
     <div id='editor-menu'>
 		<ul class="tabs">
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 3881591d96..1bf379693f 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -24,7 +24,7 @@
     <%= text_field 'page', 'title', :class => 'span1', :style => ' width: 99%', :placeholder => _('Title')  %>
   </p>
 
-  <%#= render('images', { :images => @images}) unless @images.empty? %>
+  <%= render('images', { :images => @images}) unless @images.empty? %>
 
   <div id='editor-menu'>
 		<ul class="pills">
diff --git a/public/stylesheets/administration_structure.css b/public/stylesheets/administration_structure.css
index 4779de5d43..218b9e0094 100644
--- a/public/stylesheets/administration_structure.css
+++ b/public/stylesheets/administration_structure.css
@@ -90,6 +90,29 @@ footer {
 	margin-right: 340px;
 }
 
+#carousel-wrapper {
+	width: 100%;
+	overflow: hidden;
+	margin-top: 18px;
+}
+
+#carousel-content {
+	width: 3000px;
+	overflow: hidden;
+}
+
+#carousel-wrapper a {
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+	float: left;
+	padding: 4px;
+	margin-right: 20px;
+	cursor: pointer;
+}
+
 .editor-right {
 	float: right;
 	width: 280px;
@@ -175,4 +198,4 @@ margin-left: 0; padding-left:0;
 
 #active .span4 { 
 	width: 255px;
-}
\ No newline at end of file
+}