diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index b6156fe..a1d53b5 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -50,7 +50,7 @@ class CmsController < MyProfileController
           :description => type.description
         })
       end
-      render :action => 'select_article_type'
+      render :action => 'select_article_type', :layout => false
       return
     end
 
diff --git a/app/views/cms/select_article_type.rhtml b/app/views/cms/select_article_type.rhtml
index 71931ab..26b89b0 100644
--- a/app/views/cms/select_article_type.rhtml
+++ b/app/views/cms/select_article_type.rhtml
@@ -3,8 +3,10 @@
 <ul id="article_types">
   <% for type in @article_types %>
     <li>
-    <%= link_to type[:short_description], :action => 'new', :type => type[:name] %>
+    <%= link_to type[:short_description], :action => 'new', :type => type[:name], :parent_id => params[:parent_id] %>
     <br/> <%= type[:description] %>
     </li>
   <% end %>
 </ul>
+
+<%= lightbox_close_button(_('Cancel')) %>
diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index 0ccb0d7..929f7fa 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -11,7 +11,7 @@
   </h2>
 
   <% button_bar(:style => 'margin-bottom: 1em;') do %>
-    <%= button('new', _('New article'), :action => 'new') %>
+    <%= lightbox_button('new', _('New article'), :action => 'new') %>
   <% end %>
 
 <% end %>
@@ -37,7 +37,7 @@
     <% if @article %>
       <% button_bar(:class => 'file-manager-controls') do %>
         <% if @article.allow_children? %>
-          <%= button('new',  _('New subitem'), :action => 'new', :parent_id => @article.id) %>
+          <%= lightbox_button('new',  _('New subitem'), :action => 'new', :parent_id => @article.id) %>
         <% end %>
         <%= button('up', _('Go up one level'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
       <% end %>
--
libgit2 0.21.2