Index: WAeUP_SRP/trunk/profiles/default/layouts/certificate_course.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/certificate_course.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/layouts/certificate_course.xml	(revision 348)
@@ -26,5 +26,7 @@
   <property name="label_edit">Certificate code</property>
   <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="edit"/>
+  </property>
   <property name="hidden_readonly_layout_modes"/>
  </widget>
@@ -37,15 +39,20 @@
   <property name="label_edit">Certificate original code</property>
   <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="edit"/>
+  </property>
   <property name="hidden_readonly_layout_modes"/>
  </widget>
  <widget name="code" meta_type="String Widget">
-  <property name="title">Code</property>
+  <property name="title">Course Code</property>
   <property name="fields">
    <element value="code"/>
   </property>
   <property name="is_required">True</property>
-  <property name="label">Code</property>
-  <property name="label_edit">Code</property>
+  <property name="label">Course Code</property>
+  <property name="label_edit">Course Code</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">10</property>
  </widget>
@@ -76,7 +83,4 @@
    <cell name="core_or_elective"/>
   </row>
-  <row>
-   <cell name="admin_status"/>
-  </row>
  </table>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/layouts/waeup_common.xml	(revision 348)
@@ -7,15 +7,4 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <widget name="Description" meta_type="Text Widget">
-  <property name="fields">
-   <element value="Description"/>
-  </property>
-  <property name="label">Description</property>
-  <property name="label_edit">Description</property>
-  <property name="is_i18n">True</property>
-  <property name="hidden_layout_modes"/>
-  <property name="css_class">description</property>
-  <property name="width">72</property>
- </widget>
  <widget name="Title" meta_type="String Widget">
   <property name="fields">
@@ -25,4 +14,9 @@
   <property name="label">Title</property>
   <property name="label_edit">Title</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="view"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">40</property>
   <property name="size_max">200</property>
@@ -32,7 +26,4 @@
    <cell name="Title"/>
   </row>
-  <row>
-   <cell name="Description"/>
-  </row>
  </table>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/rolemap.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/rolemap.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/rolemap.xml	(revision 348)
@@ -2,17 +2,44 @@
 <rolemap>
   <roles>
-    <role name="CourseAdvisor"/>
-    <role name="Lecturer"/>
-    <role name="Student"/>
+    <role name="SectionReader"/>
+    <role name="SectionManager"/>
   </roles>
   <permissions>
+    <permission name="List folder contents" acquire="True">
+      <role name="SectionManager"/>
+      <role name="SectionReader"/>
+    </permission>
     <permission name="Add portal content" acquire="True">
-      <role name="Student"/>
+      <role name="SectionManager"/>
     </permission>
     <permission name="Add portal folders" acquire="True">
-      <role name="Student"/>
+      <role name="SectionManager"/>
     </permission>
     <permission name="Delete objects" acquire="True">
-      <role name="Manager"/>
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="Change subobjects order" acquire="True">
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="Manage properties" acquire="True">
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="List portal members" acquire="True">
+      <role name="Member"/>
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="Review portal content" acquire="True">
+      <role name="Reviewer"/>
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="Modify portal content" acquire="True">
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="Set own password" acquire="True">
+      <role name="Member"/>
+      <role name="SectionManager"/>
+    </permission>
+    <permission name="Undo changes" acquire="False">
+      <role name="SectionManager"/>
     </permission>
   </permissions>
Index: WAeUP_SRP/trunk/profiles/default/types/Certificate.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/Certificate.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/types/Certificate.xml	(revision 348)
@@ -33,4 +33,5 @@
  <property name="cps_is_portlet">False</property>
  <alias from="(Default)" to="academics_contents"/>
+ <alias from="created" to="level_created"/>
  <alias from="view" to="academics_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""
Index: WAeUP_SRP/trunk/profiles/default/types/Semester.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/Semester.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/types/Semester.xml	(revision 348)
@@ -56,5 +56,5 @@
  <action title="Add Course" action_id="new_entry" category="object"
     condition_expr=""
-    url_expr="string:${object_url}/content_create?type_name=Course"
+    url_expr="string:${object_url}/content_create?type_name=CertificateCourse"
     visible="True"/>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/types/StudyLevel.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/StudyLevel.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/types/StudyLevel.xml	(revision 348)
@@ -22,5 +22,7 @@
   <element value="common"/>
  </property>
- <property name="layouts"/>
+ <property name="layouts">
+  <element value="waeup_common"/>
+ </property>
  <property name="layout_clusters">
   <element value="metadata:metadata"/>
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_base_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_base_wf/definition.xml	(revision 343)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_base_wf/definition.xml	(revision 348)
@@ -21,5 +21,4 @@
    <permission-role>Manager</permission-role>
    <permission-role>SectionManager</permission-role>
-   <permission-role>SectionReviewer</permission-role>
    <permission-role>SectionReader</permission-role>
   </permission-map>
@@ -32,4 +31,5 @@
   <guard>
    <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
   </guard>
  </transition>
@@ -41,5 +41,4 @@
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
-   <guard-role>Contributor</guard-role>
   </guard>
   <transition-behavior behavior_id="initial-create"/>
@@ -52,7 +51,4 @@
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
-   <guard-role>SectionReviewer</guard-role>
-   <guard-role>SectionReader</guard-role>
-   <guard-role>Contributor</guard-role>
   </guard>
   <transition-behavior behavior_id="allow-sub-create"/>
@@ -66,6 +62,4 @@
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
-   <guard-role>SectionReviewer</guard-role>
-   <guard-role>SectionReader</guard-role>
   </guard>
   <transition-behavior behavior_id="allow-sub-move"/>
