diff --git a/app/models/enterprise_homepage.rb b/app/models/enterprise_homepage.rb
index c7f3026..004922a 100644
--- a/app/models/enterprise_homepage.rb
+++ b/app/models/enterprise_homepage.rb
@@ -5,7 +5,7 @@ class EnterpriseHomepage < Article
   end
 
   def self.short_description
-    __('Enterprise homepage.')
+    __('Enterprise homepage')
   end
 
   def self.description
diff --git a/app/views/content_viewer/_article_toolbar.rhtml b/app/views/content_viewer/_article_toolbar.rhtml
index 1dd2e84..aee80d5 100644
--- a/app/views/content_viewer/_article_toolbar.rhtml
+++ b/app/views/content_viewer/_article_toolbar.rhtml
@@ -34,11 +34,11 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
 
-      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) if !remove_content_button(:new) %>
+      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) unless remove_content_button(:new) %>
     <% end %>
 
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
-      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) if !remove_content_button(:upload)%>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload)%>
     <% end %>
 
     <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
diff --git a/plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb b/plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb
index 25f31a7..53ac8a0 100644
--- a/plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb
+++ b/plugins/work_assignment/views/cms/work_assignment_plugin/_work_assignment.html.erb
@@ -1,3 +1,3 @@
 <%= render :partial => 'folder', :locals => {:f => f} %>
 
-<%= f.check_box(:publish_submissions) %>
+<%= labelled_check_box(_('Publish submissions'), 'article[publish_submissions]', true, @article.publish_submissions) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2ce1436..a0b7560 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2290,6 +2290,9 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   background: none;
   border: none;
 }
+.formfield.type-select select {
+  max-width: 100%;
+}
 .submitline {
   text-align: center;
 }
@@ -2438,7 +2441,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   width: 50%;
 }
 
-.description {
+.controller-admin_panel .description {
   background-color: #E6E6E6;
   border: 1px solid #CCC;
   padding: 5px;
--
libgit2 0.21.2