diff --git a/config/routing.yml b/config/routing.yml
new file mode 100644
index 0000000000..9f76e4dac9
--- /dev/null
+++ b/config/routing.yml
@@ -0,0 +1,13 @@
+admin_login_check:
+    pattern:   /admin/login_check
+admin_logout:
+    pattern:   /admin/logout
+
+homepage:
+    path:      /homepage
+    defaults:  { _controller: index.controller:indexAction, culture: en }
+
+example:
+    resource: "src/ChamiloLMS/Resources/config/route_example.yml"
+    prefix:   /example-route
+
diff --git a/main/css/base.css b/main/css/base.css
index 228a672570..5d01e56844 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -5390,15 +5390,21 @@ i.size-32.icon-new-work {
     list-style-type: none;
 }
 .trajectory .control-group {
-    margin-left: 25px;
+    /* margin-left: 25px; */
 }
 
 .trajectory .control-group label {
 }
 
+.trajectory .btn-group {
+    margin-top: -50px;
+    margin-right: -10px;
+    float: right;
+}
 
 #saveQuestionBar {
     width:150px;
     bottom:140px;
     position:fixed;
 }
+
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 0ecebc7377..ff9695b30b 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -127,6 +127,7 @@ define('TOOL_GRADEBOOK', 'gradebook');
 define('TOOL_NOTEBOOK', 'notebook');
 define('TOOL_ATTENDANCE', 'attendance');
 define('TOOL_COURSE_PROGRESS', 'course_progress');
+define('TOOL_CURRICULUM', 'curriculum');
 
 // CONSTANTS defining Chamilo interface sections
 define('SECTION_CAMPUS', 'mycampus');
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 61c11b98c6..df27474e46 100644
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -4279,6 +4279,7 @@ class CourseManager
         Database::query("INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_NOTEBOOK."','notebook/index.php','notebook.gif','".Text::string2binary(api_get_setting('course_create_active_tools', 'notebook'))."','0','squaregrey.gif','NO','_self','interaction','0')");
         Database::query("INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_ATTENDANCE."','attendance/index.php','attendance.gif','".Text::string2binary(api_get_setting('course_create_active_tools', 'attendances'))."','0','squaregrey.gif','NO','_self','authoring','0')");
         Database::query("INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_COURSE_PROGRESS."','course_progress/index.php','course_progress.gif','".Text::string2binary(api_get_setting('course_create_active_tools', 'course_progress'))."','0','squaregrey.gif','NO','_self','authoring','0')");
+        Database::query("INSERT INTO $tbl_course_homepage VALUES ($course_id, NULL, '" . TOOL_CURRICULUM."','curriculum','cv.png','".Text::string2binary(api_get_setting('course_create_active_tools', 'curriculum'))."','0','squaregrey.gif','NO','_self','authoring','0')");
 
         if (api_get_setting('service_visio', 'active') == 'true') {
             $mycheck = api_get_setting('service_visio', 'visio_host');
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index 149ce97b9d..fd92643a70 100644
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -1,7 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-class CourseHome {
+class CourseHome
+{
 
     /**
      * Gets the html content to show in the 3 column view
@@ -18,7 +19,7 @@ class CourseHome {
         $course_id = api_get_course_int_id();
 
         switch ($cat) {
-            case 'Basic' :
+            case 'Basic':
                 $condition_display_tools = ' WHERE a.c_id = '.$course_id.' AND  a.link=t.link AND t.position="basic" ';
                 if ((api_is_coach() || api_is_course_tutor()) && $_SESSION['studentview'] != 'studentview') {
                     $condition_display_tools = ' WHERE a.c_id = '.$course_id.' AND a.link=t.link AND (t.position="basic" OR a.name = "'.TOOL_TRACKING.'") ';
@@ -27,7 +28,7 @@ class CourseHome {
                 $sql = "SELECT a.*, t.image img, t.row_module, t.column_module  FROM $TBL_ACCUEIL a, $TABLE_TOOLS t
                         $condition_display_tools ORDER BY t.row_module, t.column_module";
                 break;
-            case 'External' :
+            case 'External':
                 if (api_is_allowed_to_edit()) {
                     $sql = "SELECT a.*, t.image img FROM $TBL_ACCUEIL a, $TABLE_TOOLS t
                             WHERE a.c_id = $course_id AND ((a.link=t.link AND t.position='external')
@@ -40,12 +41,12 @@ class CourseHome {
                             ORDER BY a.id";
                 }
                 break;
-            case 'courseAdmin' :
+            case 'courseAdmin':
                 $sql = "SELECT a.*, t.image img, t.row_module, t.column_module  FROM $TBL_ACCUEIL a, $TABLE_TOOLS t
                         WHERE a.c_id = $course_id AND admin=1 AND a.link=t.link ORDER BY t.row_module, t.column_module";
                 break;
 
-            case 'platformAdmin' :
+            case 'platformAdmin':
                $sql = "SELECT *, image img FROM $TBL_ACCUEIL WHERE c_id = $course_id AND visibility = 2 ORDER BY id";
         }
         $result = Database::query($sql);
@@ -205,7 +206,8 @@ class CourseHome {
      * @param string $course_tool_category	contains the category of tools to display:
      * "Public", "PublicButHide", "courseAdmin", "claroAdmin"
      */
-    public static function show_tool_2column($course_tool_category) {
+    public static function show_tool_2column($course_tool_category)
+    {
         $html = '';
         $web_code_path = api_get_path(WEB_CODE_PATH);
         $course_tool_table = Database::get_course_table(TABLE_TOOL_LIST);
@@ -249,13 +251,13 @@ class CourseHome {
 
         switch ($course_tool_category)  {
             case TOOL_PUBLIC:
-                $sql_links="SELECT tl.*, tip.visibility
+                $sql_links = "SELECT tl.*, tip.visibility
                         FROM $course_link_table tl
                         LEFT JOIN $course_item_property_table tip ON tip.tool='link' AND tl.c_id = tip.c_id AND tl.c_id = $course_id AND tip.ref=tl.id
                         WHERE tl.on_homepage='1' AND tip.visibility = 1";
                 break;
             case TOOL_PUBLIC_BUT_HIDDEN:
-                $sql_links="SELECT tl.*, tip.visibility
+                $sql_links = "SELECT tl.*, tip.visibility
                     FROM $course_link_table tl
                     LEFT JOIN $course_item_property_table tip ON tip.tool='link' AND tl.c_id = tip.c_id AND tl.c_id = $course_id AND tip.ref=tl.id
                     WHERE tl.on_homepage='1' AND tip.visibility = 0";
@@ -403,7 +405,8 @@ class CourseHome {
      * @return array
      */
 
-    public static function get_tools_category($course_tool_category) {
+    public static function get_tools_category($course_tool_category)
+    {
         $course_tool_table  = Database::get_course_table(TABLE_TOOL_LIST);
         $is_platform_admin  = api_is_platform_admin();
         $all_tools_list = array();
@@ -415,46 +418,46 @@ class CourseHome {
 
         switch ($course_tool_category) {
             case TOOL_STUDENT_VIEW:
-                    $condition_display_tools = ' WHERE visibility = 1 AND (category = "authoring" OR category = "interaction" OR category = "plugin") ';
-                    if ((api_is_coach() || api_is_course_tutor()) && $_SESSION['studentview'] != 'studentview') {
-                        $condition_display_tools = ' WHERE (visibility = 1 AND (category = "authoring" OR category = "interaction" OR category = "plugin") OR (name = "'.TOOL_TRACKING.'") )   ';
-                    }
-                    $sql = "SELECT * FROM $course_tool_table  $condition_display_tools AND c_id = $course_id $condition_session ORDER BY id";
-                    $result = Database::query($sql);
-                    $col_link ="##003399";
-                    break;
+                $condition_display_tools = ' WHERE visibility = 1 AND (category = "authoring" OR category = "interaction" OR category = "plugin") ';
+                if ((api_is_coach() || api_is_course_tutor()) && $_SESSION['studentview'] != 'studentview') {
+                    $condition_display_tools = ' WHERE (visibility = 1 AND (category = "authoring" OR category = "interaction" OR category = "plugin") OR (name = "'.TOOL_TRACKING.'") )   ';
+                }
+                $sql = "SELECT * FROM $course_tool_table  $condition_display_tools AND c_id = $course_id $condition_session ORDER BY id";
+                $result = Database::query($sql);
+                $col_link ="##003399";
+                break;
             case TOOL_AUTHORING:
-                    $sql = "SELECT * FROM $course_tool_table WHERE category = 'authoring' AND c_id = $course_id $condition_session ORDER BY id";
-                    $result = Database::query($sql);
-                    $col_link ="##003399";
-                    break;
+                $sql = "SELECT * FROM $course_tool_table WHERE category = 'authoring' AND c_id = $course_id $condition_session ORDER BY id";
+                $result = Database::query($sql);
+                $col_link ="##003399";
+                break;
             case TOOL_INTERACTION:
-                    $sql = "SELECT * FROM $course_tool_table WHERE category = 'interaction' AND c_id = $course_id $condition_session ORDER BY id";
-                    $result = Database::query($sql);
-                    $col_link ="##003399";
-                    break;
+                $sql = "SELECT * FROM $course_tool_table WHERE category = 'interaction' AND c_id = $course_id $condition_session ORDER BY id";
+                $result = Database::query($sql);
+                $col_link ="##003399";
+                break;
             case TOOL_ADMIN_VISIBLE:
-                    $sql = "SELECT * FROM $course_tool_table WHERE category = 'admin' AND visibility ='1' AND c_id = $course_id $condition_session ORDER BY id";
-                    $result = Database::query($sql);
-                    $col_link ="##003399";
-                    break;
+                $sql = "SELECT * FROM $course_tool_table WHERE category = 'admin' AND visibility ='1' AND c_id = $course_id $condition_session ORDER BY id";
+                $result = Database::query($sql);
+                $col_link ="##003399";
+                break;
             case TOOL_ADMIN_PLATFORM:
-                    $sql = "SELECT * FROM $course_tool_table WHERE category = 'admin' AND c_id = $course_id $condition_session ORDER BY id";
-                    $result = Database::query($sql);
-                    $col_link ="##003399";
-                    break;
+                $sql = "SELECT * FROM $course_tool_table WHERE category = 'admin' AND c_id = $course_id $condition_session ORDER BY id";
+                $result = Database::query($sql);
+                $col_link ="##003399";
+                break;
             case TOOL_COURSE_PLUGIN:
-                    //Other queries recover id, name, link, image, visibility, admin, address, added_tool, target, category and session_id
-                    // but plugins are not present in the tool table, only globally and inside the course_settings table once configured
-                    $sql = "SELECT * FROM $course_tool_table WHERE category = 'plugin' AND c_id = $course_id $condition_session ORDER BY id";
-                    $result = Database::query($sql);
-                    break;
+                //Other queries recover id, name, link, image, visibility, admin, address, added_tool, target, category and session_id
+                // but plugins are not present in the tool table, only globally and inside the course_settings table once configured
+                $sql = "SELECT * FROM $course_tool_table WHERE category = 'plugin' AND c_id = $course_id $condition_session ORDER BY id";
+                $result = Database::query($sql);
+                break;
         }
 
         //Get the list of hidden tools - this might imply performance slowdowns
         // if the course homepage is loaded many times, so the list of hidden
         // tools might benefit from a shared memory storage later on
-        $list = api_get_settings('Tools','list', api_get_current_access_url_id());
+        $list = api_get_settings('Tools', 'list', api_get_current_access_url_id());
         $hide_list = array();
         $check = false;
 
@@ -575,20 +578,21 @@ class CourseHome {
      * @param   int rows
      * @return void
      */
-    public static function show_tools_category($all_tools_list, $rows = false) {
+    public static function show_tools_category($all_tools_list, $rows = false)
+    {
         $rowDiv =  '<div class="row-fluid">';
         $theme = api_get_setting('homepage_view');
         if ($theme == 'vertical_activity') {
             //ordering by get_lang name
             $order_tool_list = array();
             if (is_array($all_tools_list) && count($all_tools_list)>0) {
-                foreach($all_tools_list as $key=>$new_tool) {
+                foreach ($all_tools_list as $key => $new_tool) {
                     $tool_name = self::translate_tool_name($new_tool);
                     $order_tool_list [$key]= $tool_name;
                 }
                 natsort($order_tool_list);
                 $my_temp_tool_array = array();
-                foreach($order_tool_list as $key=>$new_tool) {
+                foreach ($order_tool_list as $key => $new_tool) {
                     $my_temp_tool_array[] = $all_tools_list[$key];
                 }
                 $all_tools_list = $my_temp_tool_array;
@@ -596,6 +600,7 @@ class CourseHome {
                 $all_tools_list = array();
             }
         }
+        $courseInfo = api_get_course_info();
         $web_code_path      = api_get_path(WEB_CODE_PATH);
         $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
         $is_platform_admin  = api_is_platform_admin();
@@ -613,6 +618,14 @@ class CourseHome {
 
                 $tool['original_link'] = $tool['link'];
 
+                // Re-writing URL for new tools
+                $newTools = array(TOOL_CURRICULUM);
+
+                $toolName = isset($tool['name']) ? $tool['name'] : null;
+                if (in_array($toolName, $newTools)) {
+                    $tool['link'] = $courseInfo['course_web_public_url'].$tool['name'].'/';
+                }
+
                 if ($tool['image'] == 'scormbuilder.gif') {
                     // display links to lp only for current session
                     /*if ($session_id != $tool['session_id']) {
@@ -620,7 +633,7 @@ class CourseHome {
                     }*/
                     // check if the published learnpath is visible for student
                     $published_lp_id = self::get_published_lp_id_from_link($tool['link']);
-                    if (!api_is_allowed_to_edit(null, true) && !learnpath::is_lp_visible_for_student($published_lp_id,api_get_user_id())) {
+                    if (!api_is_allowed_to_edit(null, true) && !learnpath::is_lp_visible_for_student($published_lp_id, api_get_user_id())) {
                         continue;
                     }
                 }
@@ -678,9 +691,9 @@ class CourseHome {
                     $tool['link'] = $web_code_path.$tool['link'];
                 }
                 if ($tool['visibility'] == '0' && $tool['admin'] != '1') {
-                      $class = 'invisible';
-                      $info = pathinfo($tool['image']);
-                      $basename = basename($tool['image'], '.'.$info['extension']); // $file is set to "index"
+                    $class = 'invisible';
+                    $info = pathinfo($tool['image']);
+                    $basename = basename($tool['image'], '.'.$info['extension']); // $file is set to "index"
                     $tool['image'] = $basename.'_na.'.$info['extension'];
                 } else {
                     $class = '';
@@ -698,7 +711,7 @@ class CourseHome {
 
                 //$tool['link'] = htmlspecialchars($tool['link']) ;
                 //@todo this visio stuff should be removed
-                if (strpos($tool['name'],'visio_') !== false) {
+                if (strpos($tool['name'], 'visio_') !== false) {
                     $tool_link_params = array(
                         'id'      => 'tooldesc_'.$tool["id"],
                         'href'    => '"javascript: void(0);"',
@@ -720,6 +733,8 @@ class CourseHome {
                             'class'   => $class,
                             'target'  =>  '_blank');
                     } else {
+
+
                         $tool_link_params = array(
                             'id'      => 'tooldesc_'.$tool["id"],
                             'href'    => $tool['link'],
@@ -800,7 +815,7 @@ class CourseHome {
                                 $image = $original_image;
                         }
 
-                        $data .= Display::url($image , $item['url_params']['href'], $item['url_params']);
+                        $data .= Display::url($image, $item['url_params']['href'], $item['url_params']);
                         $html .= Display::div($data, array('class'=>'big_icon')); //box-image reflection
                         $html .= Display::div('<h4>'.$item['visibility'].$item['extra'].$item['link'].'</h4>', array('class'=>'content'));
                         $html .=  '</div>';
@@ -813,7 +828,6 @@ class CourseHome {
 
                         break;
                     case 'activity':
-
                         if ($counter == 0) {
                             $html .=  $rowDiv;
                         }
@@ -860,7 +874,8 @@ class CourseHome {
      * @param id	session id
      * @return string	session data
      */
-    public static function show_session_data($id_session) {
+    public static function show_session_data($id_session)
+    {
 
         if ($id_session != strval(intval($id_session))) {
             return '';
@@ -884,7 +899,7 @@ class CourseHome {
 
         $output  = '';
         if (!empty($session_category)) {
-            $output .= '<tr><td>'. get_lang('SessionCategory') . ': ' . '<b>' . $session_category_name .'</b></td></tr>';
+            $output .= '<tr><td>'. get_lang('SessionCategory').': '.'<b>'.$session_category_name.'</b></td></tr>';
         }
         $output .= '<tr>
                         <td style="width:50%">'. get_lang('SessionName') . ': ' . '<b>' . $session_info['name'] .'</b></td>
@@ -900,7 +915,8 @@ class CourseHome {
      * @param array $tool		The input record.
      * @return string			Returns the name of the corresponding tool.
      */
-    public static function translate_tool_name(& $tool) {
+    public static function translate_tool_name(& $tool)
+    {
         static $already_translated_icons = array(
             'file_html.gif',
             'file_html_na.gif',
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index 13e60dca63..bc7dc0997a 100644
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -928,13 +928,13 @@ class SocialManager extends UserManager {
         }
 
         if (!empty($courseCode)) {
-            //return api_get_path(WEB_PUBLIC_PATH).'users/online-in-course/'.$courseCode;
             return api_get_path(WEB_PATH).'whoisonline.php?cidReq='.$courseCode;
+            //return api_get_path(WEB_PUBLIC_PATH).'users/online/course/'.$courseCode;
         }
 
         if (!empty($sessionId)) {
-            //return api_get_path(WEB_PUBLIC_PATH).'users/online-in-session/'.$courseCode;
             return api_get_path(WEB_PATH).'whoisonlinesession.php?session_id='.$sessionId;
+            //return api_get_path(WEB_PUBLIC_PATH).'users/online/session/'.$sessionId;
         }
     }
 }
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index d5a007fa41..0ef280d652 100644
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -635,10 +635,6 @@ class Template
 
         // Preparing values for the menu
 
-        // Logout link.
-        // See the SecurityServiceProvider definition
-        $this->assign('logout_link', $this->app['url_generator']->generate('admin_logout'));
-
         // Profile link.
 
         $this->assign('is_profile_editable', api_is_profile_readable());
diff --git a/main/template/default/crud_macros/course_crud.tpl b/main/template/default/crud_macros/course_crud.tpl
new file mode 100644
index 0000000000..f1957ef2ce
--- /dev/null
+++ b/main/template/default/crud_macros/course_crud.tpl
@@ -0,0 +1,51 @@
+{% macro list(items, links, courseCode) %}
+    <a href="{{ url(links.create_link, {'courseCode': courseCode }) }}">
+        {{ 'Add' |trans }}
+    </a>
+    <table class="table">
+    {% for item in items %}
+        <tr>
+            <td>
+                <a href="{{ url(links.read_link, {'courseCode': courseCode, id: item.id }) }}">
+                {{ item.name }}
+                </a>
+            </td>
+            <td>
+                <a class="btn" href="{{ url(links.update_link, {'courseCode': courseCode, id: item.id }) }}"> {{ 'Edit' |trans }}</a>
+                <a class="btn" href="{{ url(links.delete_link, {'courseCode': courseCode, id: item.id }) }}"> {{ 'Delete' |trans }}</a>
+            </td>
+        </tr>
+    {% endfor %}
+    </table>
+{% endmacro %}
+
+{% macro add(form, links, courseCode) %}
+    <a href="{{ url(links.list_link, {'courseCode': courseCode }) }}">
+        {{ 'List' |trans }}
+    </a>
+    <hr />
+    <form action="{{ url(links.create_link, {'courseCode': courseCode} ) }}" method="post" {{ form_enctype(form) }}>
+        {{ form_widget(form) }}
+    </form>
+{% endmacro %}
+
+{% macro edit(form, links, courseCode) %}
+    <a href="{{ url(links.list_link, {'courseCode': courseCode}) }}">
+        {{ 'List' |trans }}
+    </a>
+    <form action="{{ url(links.update_link, {'courseCode': courseCode, id : item.id}) }}" method = "post" {{ form_enctype(form) }}>
+        {{ form_widget(form) }}
+    </form>
+{% endmacro %}
+
+{% macro read(item, links, courseCode) %}
+    <a href="{{ url(links.list_link, {'courseCode': courseCode}) }}">
+        {{ 'List' |trans }}
+    </a>
+    <a href="{{ url(links.update_link, {'courseCode': courseCode, id : item.id}) }}">
+        {{ 'Edit' |trans }}
+    </a>
+    <h2>{{ item.id }}</h2>
+    <p>{{ item.name }}</p>
+{% endmacro %}
+
diff --git a/main/template/default/default_actions/settings.tpl b/main/template/default/crud_macros/simple_crud.tpl
similarity index 100%
rename from main/template/default/default_actions/settings.tpl
rename to main/template/default/crud_macros/simple_crud.tpl
diff --git a/main/template/default/tool/curriculum/category/add.tpl b/main/template/default/tool/curriculum/category/add.tpl
index eb3dc396db..2731f9cce2 100644
--- a/main/template/default/tool/curriculum/category/add.tpl
+++ b/main/template/default/tool/curriculum/category/add.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
-    {{ actions.add(form, links) }}
+    {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
+    {{ actions.add(form, links, app.request.get('courseCode')) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/add_from_parent.tpl b/main/template/default/tool/curriculum/category/add_from_parent.tpl
index 1d0de69757..09e66e8427 100644
--- a/main/template/default/tool/curriculum/category/add_from_parent.tpl
+++ b/main/template/default/tool/curriculum/category/add_from_parent.tpl
@@ -1,10 +1,10 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.list_link) }}">
+    <a href="{{ url(links.list_link, {'courseCode' : app.request.get('courseCode')}) }}">
         List
     </a>
     <hr />
-    <form action="{{ url(links.add_from_parent_link, { "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
+    <form action="{{ url(links.add_from_parent_link, {'courseCode' : app.request.get('courseCode'), "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/edit.tpl b/main/template/default/tool/curriculum/category/edit.tpl
index 25ebcf70b6..66ed4c6eb0 100644
--- a/main/template/default/tool/curriculum/category/edit.tpl
+++ b/main/template/default/tool/curriculum/category/edit.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
-    {{ actions.edit(form, links) }}
+    {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
+    {{ actions.edit(form, links, app.request.get('courseCode')) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/list.tpl b/main/template/default/tool/curriculum/category/list.tpl
index 0b10789bb4..290601a7c1 100644
--- a/main/template/default/tool/curriculum/category/list.tpl
+++ b/main/template/default/tool/curriculum/category/list.tpl
@@ -1,6 +1,6 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.create_link) }}">
+    <a href="{{ url(links.create_link, {'courseCode' : app.request.get('courseCode') }) }}">
         Add
     </a>
     {{ tree }}
diff --git a/main/template/default/tool/curriculum/category/read.tpl b/main/template/default/tool/curriculum/category/read.tpl
index 2fd11abe30..ff196288ac 100644
--- a/main/template/default/tool/curriculum/category/read.tpl
+++ b/main/template/default/tool/curriculum/category/read.tpl
@@ -1,11 +1,13 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {{ item.id }} {{ item.name  }}
+    {{ item.id }} {{ item.name }}
     <hr />
     <ul>
     {% for subitem in subitems %}
         <li>
-            <a href="{{ url(links.question_score_name_read_link, { id: subitem.id} ) }}">{{ subitem.name }}</a>
+            <a href="{{ url(links.question_score_name_read_link, {'courseCode' : app.request.get('courseCode'), id: subitem.id} ) }}">
+                {{ subitem.name }}
+            </a>
         </li>
     {% endfor %}
     </ul>
diff --git a/main/template/default/tool/curriculum/item/add.tpl b/main/template/default/tool/curriculum/item/add.tpl
index eb3dc396db..2731f9cce2 100644
--- a/main/template/default/tool/curriculum/item/add.tpl
+++ b/main/template/default/tool/curriculum/item/add.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
-    {{ actions.add(form, links) }}
+    {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
+    {{ actions.add(form, links, app.request.get('courseCode')) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/item/add_from_category.tpl b/main/template/default/tool/curriculum/item/add_from_category.tpl
index 7c7a238907..6dca17bb86 100644
--- a/main/template/default/tool/curriculum/item/add_from_category.tpl
+++ b/main/template/default/tool/curriculum/item/add_from_category.tpl
@@ -1,10 +1,10 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.list_link) }}">
+    <a href="{{ url(links.list_link, {'courseCode' : app.request.get('courseCode')}) }}">
         List
     </a>
     <hr />
-    <form action="{{ url(links.add_from_category, { "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
+    <form action="{{ url(links.add_from_category, {'courseCode' : app.request.get('courseCode'), "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/item/edit.tpl b/main/template/default/tool/curriculum/item/edit.tpl
index 25ebcf70b6..66ed4c6eb0 100644
--- a/main/template/default/tool/curriculum/item/edit.tpl
+++ b/main/template/default/tool/curriculum/item/edit.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
-    {{ actions.edit(form, links) }}
+    {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
+    {{ actions.edit(form, links, app.request.get('courseCode')) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/item/list.tpl b/main/template/default/tool/curriculum/item/list.tpl
index 031150ddad..d3b003f4e9 100644
--- a/main/template/default/tool/curriculum/item/list.tpl
+++ b/main/template/default/tool/curriculum/item/list.tpl
@@ -1,19 +1,19 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.create_link) }}">
+    <a href="{{ url(links.create_link, {'courseCode' : app.request.get('courseCode')}) }}">
         {{ 'Add' |trans }}
     </a>
     <table class="table">
     {% for item in items %}
         <tr>
             <td>
-                <a href="{{ url(links.read_link, { id: item.id }) }}">
+                <a href="{{ url(links.read_link, {'courseCode' : app.request.get('courseCode'), id: item.id }) }}">
                 {{ item.title }}
                 </a>
             </td>
             <td>
-                <a class="btn" href="{{ url(links.update_link, { id: item.id }) }}"> {{ 'Edit' |trans }}</a>
-                <a class="btn" href="{{ url(links.delete_link, { id: item.id }) }}"> {{ 'Delete' |trans }}</a>
+                <a class="btn" href="{{ url(links.update_link, {'courseCode' : app.request.get('courseCode'), id: item.id }) }}"> {{ 'Edit' |trans }}</a>
+                <a class="btn" href="{{ url(links.delete_link, {'courseCode' : app.request.get('courseCode'), id: item.id }) }}"> {{ 'Delete' |trans }}</a>
             </td>
         </tr>
     {% endfor %}
diff --git a/main/template/default/tool/curriculum/item/read.tpl b/main/template/default/tool/curriculum/item/read.tpl
index 2fd11abe30..ff196288ac 100644
--- a/main/template/default/tool/curriculum/item/read.tpl
+++ b/main/template/default/tool/curriculum/item/read.tpl
@@ -1,11 +1,13 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {{ item.id }} {{ item.name  }}
+    {{ item.id }} {{ item.name }}
     <hr />
     <ul>
     {% for subitem in subitems %}
         <li>
-            <a href="{{ url(links.question_score_name_read_link, { id: subitem.id} ) }}">{{ subitem.name }}</a>
+            <a href="{{ url(links.question_score_name_read_link, {'courseCode' : app.request.get('courseCode'), id: subitem.id} ) }}">
+                {{ subitem.name }}
+            </a>
         </li>
     {% endfor %}
     </ul>
diff --git a/main/template/default/tool/curriculum/user/add.tpl b/main/template/default/tool/curriculum/user/add.tpl
index eb3dc396db..2731f9cce2 100644
--- a/main/template/default/tool/curriculum/user/add.tpl
+++ b/main/template/default/tool/curriculum/user/add.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
-    {{ actions.add(form, links) }}
+    {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
+    {{ actions.add(form, links, app.request.get('courseCode')) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/user/add_from_category.tpl b/main/template/default/tool/curriculum/user/add_from_category.tpl
index 7c7a238907..b809e0a48d 100644
--- a/main/template/default/tool/curriculum/user/add_from_category.tpl
+++ b/main/template/default/tool/curriculum/user/add_from_category.tpl
@@ -1,10 +1,10 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.list_link) }}">
+    <a href="{{ url(links.list_link, {'courseCode' : app.request.get('courseCode')) }}">
         List
     </a>
     <hr />
-    <form action="{{ url(links.add_from_category, { "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
+    <form action="{{ url(links.add_from_category, {'courseCode' : app.request.get('courseCode'), "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/user/edit.tpl b/main/template/default/tool/curriculum/user/edit.tpl
index 25ebcf70b6..6f54182294 100644
--- a/main/template/default/tool/curriculum/user/edit.tpl
+++ b/main/template/default/tool/curriculum/user/edit.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
-    {{ actions.edit(form, links) }}
+    {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
+    {{ actions.edit(form, links, {'courseCode' : app.request.get('courseCode'))} }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/user/list.tpl b/main/template/default/tool/curriculum/user/list.tpl
index 03a7532b46..d6c3c91b0e 100644
--- a/main/template/default/tool/curriculum/user/list.tpl
+++ b/main/template/default/tool/curriculum/user/list.tpl
@@ -83,7 +83,7 @@ function addTagFormDeleteLink($tagFormLi) {
 function save(itemId) {
     var form = $("#"+itemId).parent();
     var serializedForm = form.serialize();
-    $.post('{{ url('curriculum_user.controller:saveUserItemAction') }}', serializedForm);
+    $.post('{{ url('curriculum_user.controller:saveUserItemAction', {'courseCode' : app.request.get('courseCode')) }}', serializedForm);
     return false;
 }
 
@@ -113,9 +113,10 @@ function saveAll() {
 
                 {% for item in subcategory.items %}
                     <h5> {{ item.title }} (item) - Max {{ item.maxRepeat }}</h5>
-
+                    <div class="row">
                     {{ form_start(form_list[item.id]) }}
-                        <div id="items_{{ item.id }}" class="items" data-max="{{ item.maxRepeat }}" data-prototype="{{ form_widget(form_list[item.id].userItems.vars.prototype)|e }}" >
+
+                        <div id="items_{{ item.id }}" class="items span8" data-max="{{ item.maxRepeat }}" data-prototype="{{ form_widget(form_list[item.id].userItems.vars.prototype)|e }}" >
                             {% for widget in form_list[item.id].userItems.children %}
                                 {{ _self.widget_prototype(widget, 'Remove item') }}
                             {% endfor %}
@@ -124,16 +125,19 @@ function saveAll() {
                             </ul>
                         </div>
 
-                        <div class="btn-group">
-                            {# form_widget(form_list[item.id].submit) #}
-                            <!-- <a class="btn btn-success" onclick="save('items_{{ item.id }}');" data-target="items_{{ item.id }}">{{ 'Save items' | get_lang }}</a> -->
-                            {% if item.maxRepeat > 1 %}
-                                <a class="btn-add btn btn-primary" data-target="items_{{ item.id }}"><i class="icon-plus-sign icon-large"></i></a>
-                            {% endif %}
+                        <div class="span8">
+                            <div class="btn-group">
+                                {# form_widget(form_list[item.id].submit) #}
+                                <!-- <a class="btn btn-success" onclick="save('items_{{ item.id }}');" data-target="items_{{ item.id }}">{{ 'Save items' | get_lang }}</a> -->
+                                {% if item.maxRepeat > 1 %}
+                                    <a class="btn-add btn btn-primary" data-target="items_{{ item.id }}"><i class="icon-plus-sign icon-large"></i></a>
+                                {% endif %}
+                            </div>
                         </div>
-
                     {{ form_end(form_list[item.id]) }}
+                    </div>
                 {% endfor %}
+
             {% endfor %}
         </div>
     </div>
diff --git a/main/template/default/tool/curriculum/user/read.tpl b/main/template/default/tool/curriculum/user/read.tpl
index 2fd11abe30..ff196288ac 100644
--- a/main/template/default/tool/curriculum/user/read.tpl
+++ b/main/template/default/tool/curriculum/user/read.tpl
@@ -1,11 +1,13 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {{ item.id }} {{ item.name  }}
+    {{ item.id }} {{ item.name }}
     <hr />
     <ul>
     {% for subitem in subitems %}
         <li>
-            <a href="{{ url(links.question_score_name_read_link, { id: subitem.id} ) }}">{{ subitem.name }}</a>
+            <a href="{{ url(links.question_score_name_read_link, {'courseCode' : app.request.get('courseCode'), id: subitem.id} ) }}">
+                {{ subitem.name }}
+            </a>
         </li>
     {% endfor %}
     </ul>