diff --git a/admin/configuration.php b/admin/configuration.php
index 4de758083..4a7a39d66 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -49,6 +49,8 @@ else
 }
 
 $main_checkboxes = array(
+    'rate',
+    'rate_anonymous',
     'email_admin_on_new_user',
     'allow_user_registration',
     'email_admin_on_picture_uploaded',
@@ -233,9 +235,6 @@ switch ($page['section'])
       array(
         'GALLERY_LOCKED_YES'=>$lock_yes,
         'GALLERY_LOCKED_NO'=>$lock_no,
-        ($conf['rate']==true?'RATE_YES':'RATE_NO')=>$html_check,
-        ($conf['rate_anonymous']==true
-             ? 'RATE_ANONYMOUS_YES' : 'RATE_ANONYMOUS_NO')=>$html_check,
         'CONF_GALLERY_TITLE' => $conf['gallery_title'],
         'CONF_PAGE_BANNER' => $conf['page_banner'],
         'CONF_GALLERY_URL' => $conf['gallery_url'],
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index bf82c5d22..4a950ea34 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -38,17 +38,20 @@
       <label><input type="radio" class="radio" name="gallery_locked" value="true" {main.GALLERY_LOCKED_YES} />{lang:Yes}</label>
       <label><input type="radio" class="radio" name="gallery_locked" value="false" {main.GALLERY_LOCKED_NO} />{lang:No}</label>
     </li>
+  </ul>
+</fieldset>
+
+<fieldset id="mainConfCheck">
+  <ul>
 
     <li>
       <span class="property">{lang:Rating}</span>
-      <label><input type="radio" class="radio" name="rate" value="true" {main.RATE_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="rate" value="false" {main.RATE_NO} />{lang:No}</label>
+      <input type="checkbox" name="rate" {main.RATE} />
     </li>
 
     <li>
       <span class="property">{lang:Rating by guests}</span>
-      <label><input type="radio" class="radio" name="rate_anonymous" value="true" {main.RATE_ANONYMOUS_YES} />{lang:Yes}</label>
-      <label><input type="radio" class="radio" name="rate_anonymous" value="false" {main.RATE_ANONYMOUS_NO} />{lang:No}</label>
+      <input type="checkbox" name="rate_anonymous" {main.RATE_ANONYMOUS} />
     </li>
 
     <li>
@@ -71,7 +74,6 @@
         <input type="checkbox" name="email_admin_on_picture_uploaded" {main.EMAIL_ADMIN_ON_PICTURE_UPLOADED} />
       </label>
     </li>
-
   </ul>
 </fieldset>
 <!-- END main -->
@@ -136,8 +138,9 @@
   </ul>
 </fieldset>
 <!-- END comments -->
+
 <!-- BEGIN default -->
-<fieldset id="commentsConf">
+<fieldset id="defaultConf">
   <ul>
     <li>
       <span class="property">
diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
index 80db22cfe..3040e91ff 100644
--- a/template/yoga/admin/default-layout.css
+++ b/template/yoga/admin/default-layout.css
@@ -48,9 +48,9 @@ FORM#categoryOrdering {
   padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
 }
 FORM#categoryOrdering p {
-	text-align: left;
-	margin-top: 1em;
-	margin-bottom: 1em;
+  text-align: left;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 UL.categoryUl {
   list-style: none;
@@ -97,6 +97,18 @@ FORM#categoryPermissions LI {
   white-space: nowrap;
 }
 
+FIELDSET#mainConfCheck SPAN.property,
+FIELDSET#historyConf SPAN.property,
+FIELDSET#commentsConf SPAN.property {
+  float: right;
+  text-align: left;
+}
+FIELDSET#mainConfCheck INPUT,
+FIELDSET#historyConf INPUT,
+FIELDSET#commentsConf INPUT {
+  float: none;
+}
+
 FIELDSET#mainConf SPAN.property {
   width: 25%;
 }
@@ -104,6 +116,22 @@ FIELDSET#mainConf TEXTAREA.description {
   width: 70%;
 }
 
+FIELDSET#mainConfCheck SPAN.property,
+FIELDSET#historyConf SPAN.property {
+  width: 90%;
+}
+FIELDSET#mainConfCheck INPUT,
+FIELDSET#historyConf INPUT {
+  margin-left: 5%;
+}
+
+FIELDSET#commentsConf SPAN.property {
+  width: 85%;
+}
+FIELDSET#commentsConf INPUT {
+  margin-left: 5%;
+}
+
 /* PWG Links Menu is fixed Graphic charts */
 .pwgmenu {
   display: table;
@@ -172,6 +200,6 @@ ul.tabsheet li {
   font-weight: bold;
   padding: 4px 8px;
   border: 1px solid #fff;
-  border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
+  border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
   padding: 5px 2em 2px 2em;
 }