diff --git a/admin/tool/lp/amd/build/competencies.min.js b/admin/tool/lp/amd/build/competencies.min.js
index 3ce41c873f6..1ad14cc4273 100644
--- a/admin/tool/lp/amd/build/competencies.min.js
+++ b/admin/tool/lp/amd/build/competencies.min.js
@@ -1 +1 @@
-define(["jquery","core/notification","core/ajax","core/templates","tool_lp/dialogue","core/str","tool_lp/tree","tool_lp/dragdrop-reorder"],function(a,b,c,d,e,f,g,h){var i=function(e,f){this.itemid=e,this.itemtype=f,this.selectedCompetency=0;var g=this,h=c.call([{methodname:"tool_lp_list_competency_frameworks",args:{filters:{},sort:"sortorder"}}]);h[0].done(function(c){return g.frameworks=c,0===c.length?void d.render("tool_lp/no_frameworks_warning",{}).done(function(b){a('[data-region="actions"]').append(b),a('[data-region="actions"] button').hide()}).fail(b.exception):(a('[data-region="actions"] button').show(),g.registerEvents(),void g.registerDragDrop())}).fail(b.exception)};return i.prototype.registerDragDrop=function(){var a=this;f.get_string("movecompetency","tool_lp").done(function(b){h.dragdrop("movecompetency",b,{identifier:"movecompetency",component:"tool_lp"},{identifier:"movecompetencyafter",component:"tool_lp"},"drag-samenode","drag-parentnode","drag-handlecontainer",function(b,c){a.handleDrop.call(a,b,c)})}).fail(b.exception)},i.prototype.handleDrop=function(d,e){var f=a(d).data("id"),g=a(e).data("id"),h=this,i=[];if("course"==h.itemtype)i=c.call([{methodname:"tool_lp_reorder_course_competency",args:{courseid:h.itemid,competencyidfrom:f,competencyidto:g}}]);else{if("template"!=h.itemtype)return null;i=c.call([{methodname:"tool_lp_reorder_template_competency",args:{templateid:h.itemid,competencyidfrom:f,competencyidto:g}}])}i[0].fail(b.exception)},i.prototype.applyFilter=function(c){c.preventDefault();var e=this,f=a('[data-region="filtercompetencies"] input'),g=f.val(),h=a('[data-action="chooseframework"]'),i=h.val();this.searchCompetencies().done(function(c){var f=0,h=e.frameworks[0];for(f=0;f<e.frameworks.length;f++)e.frameworks[f].id==i?(h=e.frameworks[f],h.selected=!0):e.frameworks[f].selected=!1;h.selected=!0;var j={framework:h,frameworks:e.frameworks,competencies:c,search:g};d.render("tool_lp/link_competencies",j).done(function(b){a('[data-region="competencylinktree"]').replaceWith(b),e.initLinkCompetencies()}).fail(b.exception)}).fail(b.exception)},i.prototype.initLinkCompetencies=function(){var e=this;new g("[data-enhance=linktree]",function(a){e.selectedCompetency=a.data("id")}),a('[data-action="chooseframework"]').change(function(a){return e.applyFilter.call(e,a)}),a('[data-region="filtercompetencies"] button').click(function(b){return a(b.target).attr("disabled","disabled"),e.applyFilter.call(e,b)}),a('[data-region="competencylinktree"] [data-action="cancel"]').click(function(b){a(b.target).attr("disabled","disabled"),b.preventDefault(),e.popup.close()}),a('[data-region="competencylinktree"] [data-action="add"]').click(function(f){var g=[],h="",i="";if(f.preventDefault(),e.selectedCompetency){if(a(f.target).attr("disabled","disabled"),"course"==e.itemtype)g=c.call([{methodname:"tool_lp_add_competency_to_course",args:{courseid:e.itemid,competencyid:e.selectedCompetency}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:e.itemid}}]),h="tool_lp/course_competencies_page",i="coursecompetenciespage";else{if("template"!=e.itemtype)return null;g=c.call([{methodname:"tool_lp_add_competency_to_template",args:{templateid:e.itemid,competencyid:e.selectedCompetency}},{methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:e.itemid}}]),h="tool_lp/template_competencies_page",i="templatecompetenciespage"}g[1].done(function(c){d.render(h,c).done(function(b,c){e.popup.close(),a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)}})},i.prototype.registerEvents=function(){var e=this;a('[data-region="actions"] button').click(function(a){return e.openCompetencySelector.call(e,a)}),a('[data-action="delete-competency-link"]').click(function(f){var g=[],h="",i="";f.preventDefault();var j=a(f.target).closest("[data-id]").data("id");"course"==e.itemtype?(g=c.call([{methodname:"tool_lp_remove_competency_from_course",args:{courseid:e.itemid,competencyid:j}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:e.itemid}}]),h="tool_lp/course_competencies_page",i="coursecompetenciespage"):"template"==e.itemtype&&(g=c.call([{methodname:"tool_lp_remove_competency_from_template",args:{templateid:e.itemid,competencyid:j}},{methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:e.itemid}}]),h="tool_lp/template_competencies_page",i="templatecompetenciespage"),g[1].done(function(c){d.render(h,c).done(function(b,c){a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)})},i.prototype.addCompetencyChildren=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],this.addCompetencyChildren(b[c],b))},i.prototype.searchCompetencies=function(){var b=this,d=a.Deferred(),e=a('[data-region="filtercompetencies"] input'),f="";e.length&&(f=e.val());var g=a('[data-action="chooseframework"]'),h=b.frameworks[0].id;g.length&&(h=g.val());var i=c.call([{methodname:"tool_lp_search_competencies",args:{searchtext:f,competencyframeworkid:h}}]);return i[0].done(function(a){var c,e=[];for(c=0;c<a.length;c++){var f=a[c];"0"===f.parentid&&(f.children=[],f.haschildren=0,e[e.length]=f,b.addCompetencyChildren(f,a))}d.resolve(e)}).fail(function(a){d.reject(a)}),d.promise()},i.prototype.openCompetencySelector=function(a){a.preventDefault();var c=this;this.searchCompetencies().done(function(a){var g=c.frameworks[0];g.selected=!0;var h={framework:g,frameworks:c.frameworks,competencies:a,search:""};d.render("tool_lp/link_competencies",h).done(function(a){f.get_string("linkcompetencies","tool_lp").done(function(b){c.popup=new e(b,a,function(){c.initLinkCompetencies.call(c)})}).fail(b.exception)}).fail(b.exception)}).fail(b.exception)},i});
\ No newline at end of file
+define(["jquery","core/notification","core/ajax","core/templates","tool_lp/dialogue","core/str","tool_lp/tree","tool_lp/dragdrop-reorder"],function(a,b,c,d,e,f,g,h){var i=function(e,f,g){this.itemid=e,this.itemtype=f,this.pageContextId=g,this.selectedCompetency=0;var h=this,i=c.call([{methodname:"tool_lp_list_competency_frameworks",args:{sort:"shortname",context:{contextid:this.pageContextId},includes:"parents"}}]);i[0].done(function(c){return h.frameworks=c,0===c.length?void d.render("tool_lp/no_frameworks_warning",{}).done(function(b){a('[data-region="actions"]').append(b),a('[data-region="actions"] button').hide()}).fail(b.exception):(a('[data-region="actions"] button').show(),h.registerEvents(),void h.registerDragDrop())}).fail(b.exception)};return i.prototype.registerDragDrop=function(){var a=this;f.get_string("movecompetency","tool_lp").done(function(b){h.dragdrop("movecompetency",b,{identifier:"movecompetency",component:"tool_lp"},{identifier:"movecompetencyafter",component:"tool_lp"},"drag-samenode","drag-parentnode","drag-handlecontainer",function(b,c){a.handleDrop.call(a,b,c)})}).fail(b.exception)},i.prototype.handleDrop=function(d,e){var f=a(d).data("id"),g=a(e).data("id"),h=this,i=[];if("course"==h.itemtype)i=c.call([{methodname:"tool_lp_reorder_course_competency",args:{courseid:h.itemid,competencyidfrom:f,competencyidto:g}}]);else{if("template"!=h.itemtype)return null;i=c.call([{methodname:"tool_lp_reorder_template_competency",args:{templateid:h.itemid,competencyidfrom:f,competencyidto:g}}])}i[0].fail(b.exception)},i.prototype.applyFilter=function(c){c.preventDefault();var e=this,f=a('[data-region="filtercompetencies"] input'),g=f.val(),h=a('[data-action="chooseframework"]'),i=h.val();this.searchCompetencies().done(function(c){var f=0,h=e.frameworks[0];for(f=0;f<e.frameworks.length;f++)e.frameworks[f].id==i?(h=e.frameworks[f],h.selected=!0):e.frameworks[f].selected=!1;h.selected=!0;var j={framework:h,frameworks:e.frameworks,competencies:c,search:g};d.render("tool_lp/link_competencies",j).done(function(b){a('[data-region="competencylinktree"]').replaceWith(b),e.initLinkCompetencies()}).fail(b.exception)}).fail(b.exception)},i.prototype.initLinkCompetencies=function(){var e=this;new g("[data-enhance=linktree]",function(a){e.selectedCompetency=a.data("id")}),a('[data-action="chooseframework"]').change(function(a){return e.applyFilter.call(e,a)}),a('[data-region="filtercompetencies"] button').click(function(b){return a(b.target).attr("disabled","disabled"),e.applyFilter.call(e,b)}),a('[data-region="competencylinktree"] [data-action="cancel"]').click(function(b){a(b.target).attr("disabled","disabled"),b.preventDefault(),e.popup.close()}),a('[data-region="competencylinktree"] [data-action="add"]').click(function(f){var g=[],h="",i="";if(f.preventDefault(),e.selectedCompetency){if(a(f.target).attr("disabled","disabled"),"course"==e.itemtype)g=c.call([{methodname:"tool_lp_add_competency_to_course",args:{courseid:e.itemid,competencyid:e.selectedCompetency}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:e.itemid}}]),h="tool_lp/course_competencies_page",i="coursecompetenciespage";else{if("template"!=e.itemtype)return null;g=c.call([{methodname:"tool_lp_add_competency_to_template",args:{templateid:e.itemid,competencyid:e.selectedCompetency}},{methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:e.itemid}}]),h="tool_lp/template_competencies_page",i="templatecompetenciespage"}g[1].done(function(c){d.render(h,c).done(function(b,c){e.popup.close(),a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)}})},i.prototype.registerEvents=function(){var e=this;a('[data-region="actions"] button').click(function(a){return e.openCompetencySelector.call(e,a)}),a('[data-action="delete-competency-link"]').click(function(f){var g=[],h="",i="";f.preventDefault();var j=a(f.target).closest("[data-id]").data("id");"course"==e.itemtype?(g=c.call([{methodname:"tool_lp_remove_competency_from_course",args:{courseid:e.itemid,competencyid:j}},{methodname:"tool_lp_data_for_course_competencies_page",args:{courseid:e.itemid}}]),h="tool_lp/course_competencies_page",i="coursecompetenciespage"):"template"==e.itemtype&&(g=c.call([{methodname:"tool_lp_remove_competency_from_template",args:{templateid:e.itemid,competencyid:j}},{methodname:"tool_lp_data_for_template_competencies_page",args:{templateid:e.itemid}}]),h="tool_lp/template_competencies_page",i="templatecompetenciespage"),g[1].done(function(c){d.render(h,c).done(function(b,c){a('[data-region="'+i+'"]').replaceWith(b),d.runTemplateJS(c)}).fail(b.exception)}).fail(b.exception)})},i.prototype.addCompetencyChildren=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],this.addCompetencyChildren(b[c],b))},i.prototype.searchCompetencies=function(){var b=this,d=a.Deferred(),e=a('[data-region="filtercompetencies"] input'),f="";e.length&&(f=e.val());var g=a('[data-action="chooseframework"]'),h=b.frameworks[0].id;g.length&&(h=g.val());var i=c.call([{methodname:"tool_lp_search_competencies",args:{searchtext:f,competencyframeworkid:h}}]);return i[0].done(function(a){var c,e=[];for(c=0;c<a.length;c++){var f=a[c];"0"===f.parentid&&(f.children=[],f.haschildren=0,e[e.length]=f,b.addCompetencyChildren(f,a))}d.resolve(e)}).fail(function(a){d.reject(a)}),d.promise()},i.prototype.openCompetencySelector=function(a){a.preventDefault();var c=this;this.searchCompetencies().done(function(a){var g=c.frameworks[0];g.selected=!0;var h={framework:g,frameworks:c.frameworks,competencies:a,search:""};d.render("tool_lp/link_competencies",h).done(function(a){f.get_string("linkcompetencies","tool_lp").done(function(b){c.popup=new e(b,a,function(){c.initLinkCompetencies.call(c)})}).fail(b.exception)}).fail(b.exception)}).fail(b.exception)},i});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/competencyactions.min.js b/admin/tool/lp/amd/build/competencyactions.min.js
index 87ead549f72..971fe8c6bdf 100644
--- a/admin/tool/lp/amd/build/competencyactions.min.js
+++ b/admin/tool/lp/amd/build/competencyactions.min.js
@@ -1 +1 @@
-define(["jquery","core/url","core/templates","core/notification","core/str","core/ajax","tool_lp/dragdrop-reorder","tool_lp/tree","tool_lp/dialogue","tool_lp/menubar"],function(a,b,c,d,e,f,g,h,i,j){var k=null,l=null,m=null,n=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:k.getCompetencyFrameworkId()};null!==c&&(d.parentid=c.id);var e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},o=function(){if("undefined"==typeof m&&(m=0),m!=l){var b=a('[data-region="filtercompetencies"]').data("frameworkid"),c=f.call([{methodname:"tool_lp_set_parent_competency",args:{competencyid:l,parentid:m}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(t).fail(d.exception)}},p=function(b){new h("[data-enhance=movetree]",function(b){m=a(b).data("id")});var c=a(b.getContent());c.on("click",'[data-action="move"]',function(){b.close(),o()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},q=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],q(b[c],b))},r=function(){var b=a('[data-region="competencyactions"]').data("competency");l=b.id;var g=f.call([{methodname:"tool_lp_search_competencies",args:{competencyframeworkid:b.competencyframeworkid,searchtext:""}},{methodname:"tool_lp_read_competency_framework",args:{id:b.competencyframeworkid}}]);a.when.apply(null,g).done(function(a,f){var g,h=[];for(g=0;g<a.length;g++){var j=a[g];"0"===j.parentid&&(j.children=[],j.haschildren=0,h[h.length]=j,q(j,a))}e.get_strings([{key:"movecompetency",component:"tool_lp",param:b.shortname},{key:"move",component:"tool_lp"},{key:"cancel",component:"moodle"}]).done(function(a){var b={framework:f,competencies:h};c.render("tool_lp/competencies_move_tree",b).done(function(b){new i(a[0],b,p)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},s=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:k.getCompetencyFrameworkId(),id:c.id,parentid:c.parentid},e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},t=function(b){c.render("tool_lp/manage_competencies_page",b).done(function(b,d){a('[data-region="managecompetencies"]').replaceWith(b),c.runTemplateJS(d)}).fail(d.exception)},u=function(b){b.preventDefault();var c=a('[data-region="filtercompetencies"]').data("frameworkid"),e=f.call([{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:c,search:a('[data-region="filtercompetencies"] input').val()}}]);e[0].done(t).fail(d.exception)},v=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_up_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(t).fail(d.exception)},w=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_down_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(t).fail(d.exception)},x=function(){var g=a('[data-region="competencyactions"]').data("competency"),h=f.call([{methodname:"tool_lp_list_courses_using_competency",args:{id:g.id}}]);h[0].done(function(a){var f={courseviewurl:b.relativeUrl("/course/view.php"),courses:a};c.render("tool_lp/linked_courses_summary",f).done(function(a){e.get_string("linkedcourses","tool_lp").done(function(b){new i(b,a,p)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},y=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_delete_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(t).fail(d.exception)},z=function(){var b=a('[data-region="competencyactions"]').data("competency");c.render("tool_lp/competency_summary",b).done(function(a){e.get_strings([{key:"confirm",component:"moodle"},{key:"deletecompetency",component:"tool_lp",param:a},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],y)}).fail(d.exception)}).fail(d.exception)},A=function(b){b.originalEvent.dataTransfer.setData("text",a(b.target).data("id"))},B=function(a){a.originalEvent.dataTransfer.dropEffect="move",a.preventDefault()},C=function(b){b.preventDefault(),a(this).addClass("currentdragtarget")},D=function(b){b.preventDefault(),a(this).removeClass("currentdragtarget")},E=function(b){b.preventDefault(),l=b.originalEvent.dataTransfer.getData("text"),m=a(b.target).data("id"),a(this).removeClass("currentdragtarget"),o()};return{init:function(b){k=b,a('[data-region="competencyactions"]').on("click",n),j.enhance(".competencyactionsmenu",{'[data-action="edit"]':s,'[data-action="delete"]':z,'[data-action="move"]':r,'[data-action="moveup"]':v,'[data-action="movedown"]':w,'[data-action="linkedcourses"]':x}),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="filtercompetencies"]').on("submit",u),a('[data-region="managecompetencies"] li').on("dragstart",A),a('[data-region="managecompetencies"] li').on("dragover",B),a('[data-region="managecompetencies"] li').on("dragenter",C),a('[data-region="managecompetencies"] li').on("dragleave",D),a('[data-region="managecompetencies"] li').on("drop",E)},selectionChanged:function(b){var e=a(b).data("id");if(j.closeAll(),"undefined"==typeof e)a('[data-region="competencyinfo"]').html(b.clone().children().remove().end().text()),a('[data-region="competencyactions"]').data("competency",null),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="competencyactions"] [data-action="add"]').removeAttr("disabled");else{var f=k.getCompetency(e);a('[data-region="competencyactionsmenu"]').show(),c.render("tool_lp/competency_summary",f).done(function(b){a('[data-region="competencyinfo"]').html(b)}).fail(d.exception),a('[data-region="competencyactions"]').data("competency",f),a('[data-region="competencyactions"] [data-action="add"]').removeAttr("disabled")}}}});
\ No newline at end of file
+define(["jquery","core/url","core/templates","core/notification","core/str","core/ajax","tool_lp/dragdrop-reorder","tool_lp/tree","tool_lp/dialogue","tool_lp/menubar"],function(a,b,c,d,e,f,g,h,i,j){var k,l=null,m=null,n=null,o=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:l.getCompetencyFrameworkId(),pagecontextid:k};null!==c&&(d.parentid=c.id);var e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},p=function(){if("undefined"==typeof n&&(n=0),n!=m){var b=a('[data-region="filtercompetencies"]').data("frameworkid"),c=f.call([{methodname:"tool_lp_set_parent_competency",args:{competencyid:m,parentid:n}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(u).fail(d.exception)}},q=function(b){new h("[data-enhance=movetree]",function(b){n=a(b).data("id")});var c=a(b.getContent());c.on("click",'[data-action="move"]',function(){b.close(),p()}),c.on("click",'[data-action="cancel"]',function(){b.close()})},r=function(a,b){var c;for(c=0;c<b.length;c++)b[c].parentid==a.id&&(a.haschildren=!0,b[c].children=[],b[c].haschildren=!1,a.children[a.children.length]=b[c],r(b[c],b))},s=function(){var b=a('[data-region="competencyactions"]').data("competency");m=b.id;var g=f.call([{methodname:"tool_lp_search_competencies",args:{competencyframeworkid:b.competencyframeworkid,searchtext:""}},{methodname:"tool_lp_read_competency_framework",args:{id:b.competencyframeworkid}}]);a.when.apply(null,g).done(function(a,f){var g,h=[];for(g=0;g<a.length;g++){var j=a[g];"0"===j.parentid&&(j.children=[],j.haschildren=0,h[h.length]=j,r(j,a))}e.get_strings([{key:"movecompetency",component:"tool_lp",param:b.shortname},{key:"move",component:"tool_lp"},{key:"cancel",component:"moodle"}]).done(function(a){var b={framework:f,competencies:h};c.render("tool_lp/competencies_move_tree",b).done(function(b){new i(a[0],b,q)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},t=function(){var c=a('[data-region="competencyactions"]').data("competency"),d={competencyframeworkid:l.getCompetencyFrameworkId(),id:c.id,parentid:c.parentid,pagecontextid:k},e=a.param(d);window.location=b.relativeUrl("/admin/tool/lp/editcompetency.php?"+e)},u=function(b){c.render("tool_lp/manage_competencies_page",b).done(function(b,d){a('[data-region="managecompetencies"]').replaceWith(b),c.runTemplateJS(d)}).fail(d.exception)},v=function(b){b.preventDefault();var c=a('[data-region="filtercompetencies"]').data("frameworkid"),e=f.call([{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:c,search:a('[data-region="filtercompetencies"] input').val()}}]);e[0].done(u).fail(d.exception)},w=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_up_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(u).fail(d.exception)},x=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_move_down_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(u).fail(d.exception)},y=function(){var g=a('[data-region="competencyactions"]').data("competency"),h=f.call([{methodname:"tool_lp_list_courses_using_competency",args:{id:g.id}}]);h[0].done(function(a){var f={courseviewurl:b.relativeUrl("/course/view.php"),courses:a};c.render("tool_lp/linked_courses_summary",f).done(function(a){e.get_string("linkedcourses","tool_lp").done(function(b){new i(b,a,q)}).fail(d.exception)}).fail(d.exception)}).fail(d.exception)},z=function(){var b=a('[data-region="competencyactions"]').data("competency"),c=f.call([{methodname:"tool_lp_delete_competency",args:{id:b.id}},{methodname:"tool_lp_data_for_competencies_manage_page",args:{competencyframeworkid:b.competencyframeworkid,search:a('[data-region="filtercompetencies"] input').val()}}]);c[1].done(u).fail(d.exception)},A=function(){var b=a('[data-region="competencyactions"]').data("competency");c.render("tool_lp/competency_summary",b).done(function(a){e.get_strings([{key:"confirm",component:"moodle"},{key:"deletecompetency",component:"tool_lp",param:a},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],z)}).fail(d.exception)}).fail(d.exception)},B=function(b){b.originalEvent.dataTransfer.setData("text",a(b.target).data("id"))},C=function(a){a.originalEvent.dataTransfer.dropEffect="move",a.preventDefault()},D=function(b){b.preventDefault(),a(this).addClass("currentdragtarget")},E=function(b){b.preventDefault(),a(this).removeClass("currentdragtarget")},F=function(b){b.preventDefault(),m=b.originalEvent.dataTransfer.getData("text"),n=a(b.target).data("id"),a(this).removeClass("currentdragtarget"),p()};return{init:function(b,c){l=b,k=c,a('[data-region="competencyactions"]').on("click",o),j.enhance(".competencyactionsmenu",{'[data-action="edit"]':t,'[data-action="delete"]':A,'[data-action="move"]':s,'[data-action="moveup"]':w,'[data-action="movedown"]':x,'[data-action="linkedcourses"]':y}),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="filtercompetencies"]').on("submit",v),a('[data-region="managecompetencies"] li').on("dragstart",B),a('[data-region="managecompetencies"] li').on("dragover",C),a('[data-region="managecompetencies"] li').on("dragenter",D),a('[data-region="managecompetencies"] li').on("dragleave",E),a('[data-region="managecompetencies"] li').on("drop",F)},selectionChanged:function(b){var e=a(b).data("id");if(j.closeAll(),"undefined"==typeof e)a('[data-region="competencyinfo"]').html(b.clone().children().remove().end().text()),a('[data-region="competencyactions"]').data("competency",null),a('[data-region="competencyactionsmenu"]').hide(),a('[data-region="competencyactions"] [data-action="add"]').removeAttr("disabled");else{var f=l.getCompetency(e);a('[data-region="competencyactionsmenu"]').show(),c.render("tool_lp/competency_summary",f).done(function(b){a('[data-region="competencyinfo"]').html(b)}).fail(d.exception),a('[data-region="competencyactions"]').data("competency",f),a('[data-region="competencyactions"] [data-action="add"]').removeAttr("disabled")}}}});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/frameworkdelete.min.js b/admin/tool/lp/amd/build/frameworkdelete.min.js
index 2e40701a12e..244feaba5d5 100644
--- a/admin/tool/lp/amd/build/frameworkdelete.min.js
+++ b/admin/tool/lp/amd/build/frameworkdelete.min.js
@@ -1 +1 @@
-define(["jquery","core/templates","core/ajax","core/notification","core/str"],function(a,b,c,d,e){var f=0,g=function(c,d){a('[data-region="managecompetencies"]').replaceWith(c),b.runTemplateJS(d)},h=function(a){b.render("tool_lp/manage_competency_frameworks_page",a).done(g).fail(d.exception)},i=function(){var a=c.call([{methodname:"tool_lp_delete_competency_framework",args:{id:f}},{methodname:"tool_lp_data_for_competency_frameworks_manage_page",args:[]}]);a[1].done(h).fail(d.exception)},j=function(b){b.preventDefault();var g=a(this).attr("data-frameworkid");f=g;var h=c.call([{methodname:"tool_lp_read_competency_framework",args:{id:f}}]);h[0].done(function(a){e.get_strings([{key:"confirm",component:"moodle"},{key:"deletecompetencyframework",component:"tool_lp",param:a.shortname},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],i)}).fail(d.exception)}).fail(d.exception)};return{deleteHandler:j}});
\ No newline at end of file
+define(["jquery","core/templates","core/ajax","core/notification","core/str"],function(a,b,c,d,e){var f=0,g=0,h=function(c,d){a('[data-region="managecompetencies"]').replaceWith(c),b.runTemplateJS(d)},i=function(a){b.render("tool_lp/manage_competency_frameworks_page",a).done(h).fail(d.exception)},j=function(){var a=c.call([{methodname:"tool_lp_delete_competency_framework",args:{id:g}},{methodname:"tool_lp_data_for_competency_frameworks_manage_page",args:{pagecontextid:f}}]);a[1].done(i).fail(d.exception)},k=function(b){b.preventDefault();var f=a(this).attr("data-frameworkid");g=f;var h=c.call([{methodname:"tool_lp_read_competency_framework",args:{id:g}}]);h[0].done(function(a){e.get_strings([{key:"confirm",component:"moodle"},{key:"deletecompetencyframework",component:"tool_lp",param:a.shortname},{key:"delete",component:"moodle"},{key:"cancel",component:"moodle"}]).done(function(a){d.confirm(a[0],a[1],a[2],a[3],j)}).fail(d.exception)}).fail(d.exception)};return{deleteHandler:k,init:function(a){f=a}}});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/build/frameworkmove.min.js b/admin/tool/lp/amd/build/frameworkmove.min.js
deleted file mode 100644
index 7c766f91aca..00000000000
--- a/admin/tool/lp/amd/build/frameworkmove.min.js
+++ /dev/null
@@ -1 +0,0 @@
-define(["jquery","core/str","core/notification","core/ajax","tool_lp/dragdrop-reorder"],function(a,b,c,d,e){var f=function(b,e){var f=a(b).data("frameworkid"),g=a(e).data("frameworkid"),h=d.call([{methodname:"tool_lp_reorder_competency_framework",args:{from:f,to:g}}]);h[0].fail(c.exception)};return{init:function(){b.get_string("movecompetencyframework","tool_lp").done(function(a){e.dragdrop("movecompetencyframework",a,{identifier:"movecompetencyframework",component:"tool_lp"},{identifier:"movecompetencyframeworkafter",component:"tool_lp"},"drag-samenode","drag-parentnode","drag-handlecontainer",f)}).fail(c.exception)}}});
\ No newline at end of file
diff --git a/admin/tool/lp/amd/src/competencies.js b/admin/tool/lp/amd/src/competencies.js
index c033412faf2..4cd88ecfe46 100644
--- a/admin/tool/lp/amd/src/competencies.js
+++ b/admin/tool/lp/amd/src/competencies.js
@@ -37,13 +37,20 @@ define(['jquery',
      * @param {Number} itemid
      * @param {String} itemtype
      */
-    var competencies = function(itemid, itemtype) {
+    var competencies = function(itemid, itemtype, pagectxid) {
         this.itemid = itemid;
         this.itemtype = itemtype;
+        this.pageContextId = pagectxid;
         this.selectedCompetency = 0;
         var localthis = this;
         var loadframeworks = ajax.call([
-            { methodname: 'tool_lp_list_competency_frameworks', args: { filters: {}, sort: 'sortorder' } }
+            { methodname: 'tool_lp_list_competency_frameworks', args: {
+                sort: 'shortname',
+                context: {
+                    contextid: this.pageContextId,
+                },
+                includes: 'parents'
+            }}
         ]);
 
         loadframeworks[0].done(function(frameworks) {
diff --git a/admin/tool/lp/amd/src/competencyactions.js b/admin/tool/lp/amd/src/competencyactions.js
index 707d22ec28f..da7313536ab 100644
--- a/admin/tool/lp/amd/src/competencyactions.js
+++ b/admin/tool/lp/amd/src/competencyactions.js
@@ -40,6 +40,8 @@ define(['jquery',
     var moveSource = null;
     /** @var {Node} moveTarget - The end of a drag operation */
     var moveTarget = null;
+    /** @var {Number} pageContextId The page context ID. */
+    var pageContextId;
 
     /**
      * Respond to choosing the "Add" menu item for the selected node in the tree.
@@ -49,7 +51,8 @@ define(['jquery',
         var parent = $('[data-region="competencyactions"]').data('competency');
 
         var params = {
-            competencyframeworkid : treeModel.getCompetencyFrameworkId()
+            competencyframeworkid : treeModel.getCompetencyFrameworkId(),
+            pagecontextid: pageContextId
         };
 
         if (parent !== null) {
@@ -198,7 +201,8 @@ define(['jquery',
         var params = {
             competencyframeworkid : treeModel.getCompetencyFrameworkId(),
             id : competency.id,
-            parentid: competency.parentid
+            parentid: competency.parentid,
+            pagecontextid: pageContextId
         };
 
         var queryparams = $.param(params);
@@ -400,9 +404,11 @@ define(['jquery',
          *
          * @method init
          * @param {Object} model The tree model provides some useful functions for loading and searching competencies.
+         * @param {Number} pagectxid The page context ID.
          */
-        init: function(model) {
+        init: function(model, pagectxid) {
             treeModel = model;
+            pageContextId = pagectxid;
 
             $('[data-region="competencyactions"]').on('click', addHandler);
 
diff --git a/admin/tool/lp/amd/src/frameworkdelete.js b/admin/tool/lp/amd/src/frameworkdelete.js
index be38cfcb2e6..01ca378e4c0 100644
--- a/admin/tool/lp/amd/src/frameworkdelete.js
+++ b/admin/tool/lp/amd/src/frameworkdelete.js
@@ -24,6 +24,9 @@
 define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str'], function($, templates, ajax, notification, str) {
     // Private variables and functions.
 
+    /** @var {Number} pagecontextid The id of the context */
+    var pagecontextid = 0;
+
     /** @var {Number} frameworkid The id of the framework */
     var frameworkid = 0;
 
@@ -60,7 +63,7 @@ define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str'
             args: { id: frameworkid }
         }, {
             methodname: 'tool_lp_data_for_competency_frameworks_manage_page',
-            args: []
+            args: { pagecontextid: pagecontextid }
         }]);
         requests[1].done(reloadList).fail(notification.exception);
     };
@@ -108,6 +111,15 @@ define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str'
          * @method deleteHandler
          * @param {Event} e
          */
-        deleteHandler: confirmDelete
+        deleteHandler: confirmDelete,
+
+        /**
+         * Initialise the module.
+         * @method init
+         * @param {Number} contextid The context id of the page.
+         */
+        init: function(contextid) {
+            pagecontextid = contextid;
+        }
     };
 });
diff --git a/admin/tool/lp/amd/src/frameworkmove.js b/admin/tool/lp/amd/src/frameworkmove.js
deleted file mode 100644
index 6c9c0193532..00000000000
--- a/admin/tool/lp/amd/src/frameworkmove.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Move competency frameworks via ajax.
- *
- * @module     tool_lp/frameworkmove
- * @package    tool_lp
- * @copyright  2015 Damyon Wiese <damyon@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-define(['jquery',
-        'core/str',
-        'core/notification',
-        'core/ajax',
-        'tool_lp/dragdrop-reorder'],
-       function($, str, notification, ajax, dragdrop) {
-    // Private variables and functions.
-
-    /**
-     * Handle a drop on a node.
-     *
-     * @method handleDrop
-     * @param {DOMNode} drag
-     * @param {DOMNode} drop
-     */
-    var handleDrop = function(drag, drop) {
-        var from = $(drag).data('frameworkid');
-        var to = $(drop).data('frameworkid');
-
-        var requests = ajax.call([{
-            methodname: 'tool_lp_reorder_competency_framework',
-            args: { from: from, to: to }
-        }]);
-        requests[0].fail(notification.exception);
-
-    };
-
-    return /** @alias module:tool_lp/frameworkmove */ {
-        // Public variables and functions.
-        /**
-         * Initialise this plugin. It loads some strings, then adds the drag/drop functions.
-         * @method init
-         */
-        init: function() {
-            // Init this module.
-            str.get_string('movecompetencyframework', 'tool_lp').done(
-                function(movestring) {
-                    dragdrop.dragdrop('movecompetencyframework',
-                                      movestring,
-                                      { identifier: 'movecompetencyframework', component: 'tool_lp'},
-                                      { identifier: 'movecompetencyframeworkafter', component: 'tool_lp'},
-                                      'drag-samenode',
-                                      'drag-parentnode',
-                                      'drag-handlecontainer',
-                                      handleDrop);
-                }
-            ).fail(notification.exception);
-        }
-
-    };
-});
diff --git a/admin/tool/lp/classes/api.php b/admin/tool/lp/classes/api.php
index b1e896ae453..22fc3de750b 100644
--- a/admin/tool/lp/classes/api.php
+++ b/admin/tool/lp/classes/api.php
@@ -24,6 +24,8 @@
 namespace tool_lp;
 
 use stdClass;
+use context;
+use context_helper;
 use context_system;
 use context_course;
 use context_user;
@@ -47,11 +49,12 @@ class api {
      * @return competency
      */
     public static function create_competency(stdClass $record) {
+        $competency = new competency(0, $record);
+
         // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
+        require_capability('tool/lp:competencymanage', $competency->get_framework()->get_context());
 
         // OK - all set.
-        $competency = new competency(0, $record);
         $id = $competency->create();
         return $competency;
     }
@@ -65,11 +68,12 @@ class api {
      * @return boolean
      */
     public static function delete_competency($id) {
+        $competency = new competency($id);
+
         // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
+        require_capability('tool/lp:competencymanage', $competency->get_framework()->get_context());
 
         // OK - all set.
-        $competency = new competency();
         $competency->set_id($id);
         return $competency->delete();
     }
@@ -83,12 +87,11 @@ class api {
      * @return boolean
      */
     public static function move_down_competency($id) {
-        // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
-
-        // Check the current one too.
         $current = new competency($id);
 
+        // First we do a permissions check.
+        require_capability('tool/lp:competencymanage', $current->get_framework()->get_context());
+
         $max = self::count_competencies(array('parentid' => $current->get_parentid(),
                                              'competencyframeworkid' => $current->get_competencyframeworkid()));
         if ($max > 0) {
@@ -124,12 +127,11 @@ class api {
      * @return boolean
      */
     public static function move_up_competency($id) {
-        // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
-
-        // Check the current one too.
         $current = new competency($id);
 
+        // First we do a permissions check.
+        require_capability('tool/lp:competencymanage', $current->get_framework()->get_context());
+
         $sortorder = $current->get_sortorder();
         if ($sortorder == 0) {
             return false;
@@ -161,13 +163,14 @@ class api {
      * @return boolean
      */
     public static function set_parent_competency($id, $newparentid) {
+        $current = new competency($id);
+
         // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
+        require_capability('tool/lp:competencymanage', $current->get_framework()->get_context());
 
         // This will throw an exception if the parent does not exist.
 
         // Check the current one too.
-        $current = new competency($id);
         $parentframeworkid = $current->get_competencyframeworkid();
         $parentpath = '/0/';
         if ($newparentid) {
@@ -211,17 +214,20 @@ class api {
      * @return boolean
      */
     public static function update_competency($record) {
+        $current = new competency($record->id);
+
         // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
+        require_capability('tool/lp:competencymanage', $current->get_framework()->get_context());
 
         // Some things should not be changed in an update - they should use a more specific method.
-        $current = new competency($record->id);
         $record->sortorder = $current->get_sortorder();
         $record->parentid = $current->get_parentid();
         $record->competencyframeworkid = $current->get_competencyframeworkid();
 
-        // OK - all set.
         $competency = new competency(0, $record);
+        require_capability('tool/lp:competencymanage', $competency->get_framework()->get_context());
+
+        // OK - all set.
         return $competency->update();
     }
 
@@ -234,14 +240,16 @@ class api {
      * @return stdClass
      */
     public static function read_competency($id) {
+        $competency = new competency($id);
+
         // First we do a permissions check.
-        $context = context_system::instance();
+        $context = $competency->get_framework()->get_context();
         if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $context)) {
              throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
         }
 
         // OK - all set.
-        return new competency($id);
+        return $competency;
     }
 
     /**
@@ -254,8 +262,10 @@ class api {
      * @return array of competencies
      */
     public static function search_competencies($textsearch, $competencyframeworkid) {
+        $framework = new competency_framework($competencyframeworkid);
+
         // First we do a permissions check.
-        $context = context_system::instance();
+        $context = $framework->get_context();
         if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $context)) {
              throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
         }
@@ -268,7 +278,7 @@ class api {
     /**
      * Perform a search based on the provided filters and return a paginated list of records.
      *
-     * Requires tool/lp:competencyread capability at the system context.
+     * Requires tool/lp:competencyread capability at some context.
      *
      * @param array $filters A list of filters to apply to the list.
      * @param string $sort The column to sort on
@@ -278,8 +288,14 @@ class api {
      * @return array of competencies
      */
     public static function list_competencies($filters, $sort = '', $order = 'ASC', $skip = 0, $limit = 0) {
+        if (!isset($filters['competencyframeworkid'])) {
+            $context = context_system::instance();
+        } else {
+            $framework = new competency_framework($filters['competencyframeworkid']);
+            $context = $framework->get_context();
+        }
+
         // First we do a permissions check.
-        $context = context_system::instance();
         if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $context)) {
              throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
         }
@@ -292,14 +308,20 @@ class api {
     /**
      * Perform a search based on the provided filters and return a paginated list of records.
      *
-     * Requires tool/lp:competencyread capability at the system context.
+     * Requires tool/lp:competencyread capability at some context.
      *
      * @param array $filters A list of filters to apply to the list.
      * @return int
      */
     public static function count_competencies($filters) {
+        if (!isset($filters['competencyframeworkid'])) {
+            $context = context_system::instance();
+        } else {
+            $framework = new competency_framework($filters['competencyframeworkid']);
+            $context = $framework->get_context();
+        }
+
         // First we do a permissions check.
-        $context = context_system::instance();
         if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $context)) {
              throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
         }
@@ -318,11 +340,8 @@ class api {
      * @return competency_framework
      */
     public static function create_framework(stdClass $record) {
-        // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
-
-        // OK - all set.
         $framework = new competency_framework(0, $record);
+        require_capability('tool/lp:competencymanage', $framework->get_context());
         $id = $framework->create();
         return $framework;
     }
@@ -336,12 +355,8 @@ class api {
      * @return boolean
      */
     public static function delete_framework($id) {
-        // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
-
-        // OK - all set.
-        $framework = new competency_framework();
-        $framework->set_id($id);
+        $framework = new competency_framework($id);
+        require_capability('tool/lp:competencymanage', $framework->get_context());
         return $framework->delete();
     }
 
@@ -354,11 +369,13 @@ class api {
      * @return boolean
      */
     public static function update_framework($record) {
-        // First we do a permissions check.
-        require_capability('tool/lp:competencymanage', context_system::instance());
-
-        // OK - all set.
-        $framework = new competency_framework(0, $record);
+        $framework = new competency_framework($record->id);
+        // Check the permissions before update.
+        require_capability('tool/lp:competencymanage', $framework->get_context());
+        if (isset($record->contextid) && $record->contextid != $framework->get_contextid()) {
+            throw new coding_exception('Changing the context of an existing framework is forbidden.');
+        }
+        $framework->from_record($record);
         return $framework->update();
     }
 
@@ -371,51 +388,11 @@ class api {
      * @return competency_framework
      */
     public static function read_framework($id) {
-        // First we do a permissions check.
-        $context = context_system::instance();
-        if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $context)) {
-             throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
+        $framework = new competency_framework($id);
+        if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $framework->get_context())) {
+             throw new required_capability_exception($framework->get_context(), 'tool/lp:competencyread', 'nopermissions', '');
         }
-
-        // OK - all set.
-        return new competency_framework($id);
-    }
-
-    /**
-     * Move the competency framework up or down in the display list.
-     *
-     * Requires tool/lp:competencymanage capability at the system context.
-     *
-     * @param int $frameworkidfrom The framework we are moving.
-     * @param int $frameworkidto Where we are moving to. If moving down, it will go after this framework,
-     *                           If moving up, it will go before this framework.
-     * @return boolean
-     */
-    public static function reorder_framework($frameworkidfrom, $frameworkidto) {
-        require_capability('tool/lp:competencymanage', context_system::instance());
-        $down = true;
-        $frameworkfrom = new competency_framework($frameworkidfrom);
-        $frameworkto = new competency_framework($frameworkidto);
-
-        $all = self::list_frameworks(array(), 'sortorder', 'ASC', 0, 0);
-
-        if ($frameworkfrom->get_sortorder() > $frameworkto->get_sortorder()) {
-            // We are moving down, so put it after the "to" item.
-            $down = false;
-        }
-
-        foreach ($all as $id => $framework) {
-            $sort = $framework->get_sortorder();
-            if ($down && $sort > $frameworkfrom->get_sortorder() && $sort <= $frameworkto->get_sortorder()) {
-                $framework->set_sortorder($framework->get_sortorder() - 1);
-                $framework->update();
-            } else if (!$down && $sort >= $frameworkto->get_sortorder() && $sort < $frameworkfrom->get_sortorder()) {
-                $framework->set_sortorder($framework->get_sortorder() + 1);
-                $framework->update();
-            }
-        }
-        $frameworkfrom->set_sortorder($frameworkto->get_sortorder());
-        return $frameworkfrom->update();
+        return $framework;
     }
 
     /**
@@ -423,23 +400,62 @@ class api {
      *
      * Requires tool/lp:competencyread capability at the system context.
      *
-     * @param array $filters A list of filters to apply to the list.
      * @param string $sort The column to sort on
      * @param string $order ('ASC' or 'DESC')
      * @param int $skip Number of records to skip (pagination)
      * @param int $limit Max of records to return (pagination)
+     * @param context $context The parent context of the frameworks.
+     * @param string $includes Defines what other contexts to fetch frameworks from.
+     *                         Accepted values are:
+     *                          - children: All descendants
+     *                          - parents: All parents, grand parents, etc...
+     *                          - self: Context passed only.
      * @return array of competency_framework
      */
-    public static function list_frameworks($filters, $sort, $order, $skip, $limit) {
+    public static function list_frameworks($sort, $order, $skip, $limit, $context, $includes = 'children') {
+        global $DB;
+
+        if (!in_array($includes, array('children', 'parents', 'self'))) {
+            throw new coding_exception('Invalid parameter value for \'includes\'.');
+        }
+
+        // Get all the other relevant contexts.
+        $contexts = array($context->id => $context);
+
+        if ($includes == 'children') {
+            $params = array('coursecatlevel' => CONTEXT_COURSECAT, 'path' => $context->path . '/%');
+            $pathlike = $DB->sql_like('path', ':path');
+            $sql = "contextlevel = :coursecatlevel AND $pathlike";
+            $rs = $DB->get_recordset_select('context', $sql, $params);
+            foreach ($rs as $record) {
+                $ctxid = $record->id;
+                context_helper::preload_from_record($record);
+                $contexts[$ctxid] = context::instance_by_id($ctxid);
+            }
+            $rs->close();
+
+        } else if ($includes == 'parents') {
+            $children = $context->get_parent_contexts();
+            foreach ($children as $ctx) {
+                $contexts[$ctx->id] = $ctx;
+            }
+        }
+
         // First we do a permissions check.
-        $context = context_system::instance();
-        if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $context)) {
-             throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
+        foreach ($contexts as $key => $ctx) {
+            if (!has_any_capability(array('tool/lp:competencyread', 'tool/lp:competencymanage'), $ctx)) {
+                unset($contexts[$key]);
+            }
+        }
+
+        if (empty($contexts)) {
+            throw new required_capability_exception($context, 'tool/lp:competencyread', 'nopermissions', '');
         }
 
         // OK - all set.
         $framework = new competency_framework();
-        return $framework->get_records($filters, $sort, $order, $skip, $limit);
+        list($insql, $inparams) = $DB->get_in_or_equal(array_keys($contexts), SQL_PARAMS_NAMED);
+        return $framework->get_records_select("contextid $insql", $inparams, $sort, '*', $skip, $limit);
     }
 
     /**
diff --git a/admin/tool/lp/classes/competency.php b/admin/tool/lp/classes/competency.php
index baab37a7835..aa3c38ccc11 100644
--- a/admin/tool/lp/classes/competency.php
+++ b/admin/tool/lp/classes/competency.php
@@ -214,6 +214,15 @@ class competency extends persistent {
         $this->path = $path;
     }
 
+    /**
+     * Get the competencyframeworkid
+     *
+     * @return int The competency framework id.
+     */
+    public function get_framework() {
+        return new competency_framework($this->get_competencyframeworkid());
+    }
+
     /**
      * Get the competencyframeworkid
      *
diff --git a/admin/tool/lp/classes/competency_framework.php b/admin/tool/lp/classes/competency_framework.php
index cff830e1685..6f75504156f 100644
--- a/admin/tool/lp/classes/competency_framework.php
+++ b/admin/tool/lp/classes/competency_framework.php
@@ -24,6 +24,7 @@
 namespace tool_lp;
 
 use stdClass;
+use context;
 
 /**
  * Class for loading/storing competency frameworks from the DB.
@@ -57,6 +58,9 @@ class competency_framework extends persistent {
     /** @var string $scaleconfiguration scale information relevant to this framework*/
     private $scaleconfiguration = '';
 
+    /** @var int $contextid The context ID in which the framework is set. */
+    private $contextid = null;
+
     /**
      * Method that provides the table name matching this class.
      *
@@ -173,6 +177,24 @@ class competency_framework extends persistent {
         $this->visible = $visible;
     }
 
+    /**
+     * Get the context.
+     *
+     * @return context The context
+     */
+    public function get_context() {
+        return context::instance_by_id($this->contextid);
+    }
+
+    /**
+     * Get the contextid.
+     *
+     * @return string The contextid
+     */
+    public function get_contextid() {
+        return $this->contextid;
+    }
+
     /**
      * Get the scale ID.
      *
@@ -252,6 +274,9 @@ class competency_framework extends persistent {
         if (isset($record->usermodified)) {
             $this->set_usermodified($record->usermodified);
         }
+        if (isset($record->contextid)) {
+            $this->contextid = $record->contextid;
+        }
         return $this;
     }
 
@@ -275,6 +300,7 @@ class competency_framework extends persistent {
         $record->timecreated = $this->get_timecreated();
         $record->timemodified = $this->get_timemodified();
         $record->usermodified = $this->get_usermodified();
+        $record->contextid = $this->get_contextid();
 
         return $record;
     }
diff --git a/admin/tool/lp/classes/external.php b/admin/tool/lp/classes/external.php
index d702b1ff841..40cd0d44118 100644
--- a/admin/tool/lp/classes/external.php
+++ b/admin/tool/lp/classes/external.php
@@ -26,6 +26,7 @@ namespace tool_lp;
 require_once("$CFG->libdir/externallib.php");
 require_once("$CFG->libdir/grade/grade_scale.php");
 
+use context;
 use external_api;
 use external_function_parameters;
 use external_value;
@@ -90,6 +91,36 @@ class external extends external_api {
         return new external_function_parameters($params);
     }
 
+    /**
+     * Returns a prepared structure to use a context parameters.
+     * @return external_single_structure
+     */
+    protected static function get_context_parameters() {
+        $id = new external_value(
+            PARAM_INT,
+            'Context ID. Either use this value, or level and instanceid.',
+            VALUE_DEFAULT,
+            0
+        );
+        $level = new external_value(
+            PARAM_ALPHA,
+            'Context level. To be used with instanceid.',
+            VALUE_DEFAULT,
+            ''
+        );
+        $instanceid = new external_value(
+            PARAM_INT,
+            'Context instance ID. To be used with level',
+            VALUE_DEFAULT,
+            0
+        );
+        return new external_single_structure(array(
+            'contextid' => $id,
+            'contextlevel' => $level,
+            'instanceid' => $instanceid,
+        ));
+    }
+
     /**
      * Returns description of a generic count_x() parameters.
      *
@@ -216,6 +247,7 @@ class external extends external_api {
             'description' => $description,
             'descriptionformat' => $descriptionformat,
             'visible' => $visible,
+            'context' => self::get_context_parameters(),
         );
         return new external_function_parameters($params);
     }
@@ -238,7 +270,8 @@ class external extends external_api {
      * @param bool $visible Is this framework visible.
      * @return \stdClass The new record
      */
-    public static function create_competency_framework($shortname, $idnumber, $description, $descriptionformat, $visible) {
+    public static function create_competency_framework($shortname, $idnumber, $description, $descriptionformat, $visible,
+            $context) {
         $params = self::validate_parameters(self::create_competency_framework_parameters(),
                                             array(
                                                 'shortname' => $shortname,
@@ -246,10 +279,17 @@ class external extends external_api {
                                                 'description' => $description,
                                                 'descriptionformat' => $descriptionformat,
                                                 'visible' => $visible,
+                                                'context' => $context,
                                             ));
 
-        $params = (object) $params;
 
+        $context = self::get_context_from_params($params['context']);
+        self::validate_context($context);
+
+        unset($params['context']);
+        $params['contextid'] = $context->id;
+
+        $params = (object) $params;
         $result = api::create_framework($params);
         return $result->to_record();
     }
@@ -466,7 +506,46 @@ class external extends external_api {
      * @return \external_function_parameters
      */
     public static function list_competency_frameworks_parameters() {
-        return self::list_parameters_structure();
+        $sort = new external_value(
+            PARAM_ALPHANUMEXT,
+            'Column to sort by.',
+            VALUE_DEFAULT,
+            ''
+        );
+        $order = new external_value(
+            PARAM_ALPHA,
+            'Sort direction. Should be either ASC or DESC',
+            VALUE_DEFAULT,
+            ''
+        );
+        $skip = new external_value(
+            PARAM_INT,
+            'Skip this number of records before returning results',
+            VALUE_DEFAULT,
+            0
+        );
+        $limit = new external_value(
+            PARAM_INT,
+            'Return this number of records at most.',
+            VALUE_DEFAULT,
+            0
+        );
+        $includes = new external_value(
+            PARAM_ALPHA,
+            'What other contextes to fetch the frameworks from. (children, parents, self)',
+            VALUE_DEFAULT,
+            'children'
+        );
+
+        $params = array(
+            'sort' => $sort,
+            'order' => $order,
+            'skip' => $skip,
+            'limit' => $limit,
+            'context' => self::get_context_parameters(),
+            'includes' => $includes
+        );
+        return new external_function_parameters($params);
     }
 
     /**
@@ -485,39 +564,37 @@ class external extends external_api {
      * @param string $order
      * @param string $skip
      * @param int $limit
+     * @param array $context
+     * @param bool $includes
      *
      * @return array
      * @throws \required_capability_exception
      * @throws invalid_parameter_exception
      */
-    public static function list_competency_frameworks($filters, $sort, $order, $skip, $limit) {
+    public static function list_competency_frameworks($sort, $order, $skip, $limit, $context, $includes) {
         $params = self::validate_parameters(self::list_competency_frameworks_parameters(),
                                             array(
-                                                'filters' => $filters,
                                                 'sort' => $sort,
                                                 'order' => $order,
                                                 'skip' => $skip,
-                                                'limit' => $limit
+                                                'limit' => $limit,
+                                                'context' => $context,
+                                                'includes' => $includes
                                             ));
 
+        $context = self::get_context_from_params($params['context']);
+        self::validate_context($context);
+
         if ($params['order'] !== '' && $params['order'] !== 'ASC' && $params['order'] !== 'DESC') {
             throw new invalid_parameter_exception('Invalid order param. Must be ASC, DESC or empty.');
         }
 
-        $safefilters = array();
-        $validcolumns = array('id', 'shortname', 'description', 'sortorder', 'idnumber', 'visible');
-        foreach ($params['filters'] as $filter) {
-            if (!in_array($filter->column, $validcolumns)) {
-                throw new invalid_parameter_exception('Filter column was invalid');
-            }
-            $safefilters[$filter->column] = $filter->value;
-        }
-
-        $results = api::list_frameworks($safefilters,
-                                               $params['sort'],
-                                               $params['order'],
-                                               $params['skip'],
-                                               $params['limit']);
+        $results = api::list_frameworks($params['sort'],
+                                       $params['order'],
+                                       $params['skip'],
+                                       $params['limit'],
+                                       $context,
+                                       $params['includes']);
         $records = array();
         foreach ($results as $result) {
             $record = $result->to_record();
@@ -601,8 +678,7 @@ class external extends external_api {
      * @return \external_function_parameters
      */
     public static function data_for_competency_frameworks_manage_page_parameters() {
-        // No params required.
-        $params = array();
+        $params = array('pagecontext' => self::get_context_parameters());
         return new external_function_parameters($params);
     }
 
@@ -619,10 +695,19 @@ class external extends external_api {
      *
      * @return boolean
      */
-    public static function data_for_competency_frameworks_manage_page() {
+    public static function data_for_competency_frameworks_manage_page($pagecontext) {
         global $PAGE;
 
-        $renderable = new output\manage_competency_frameworks_page();
+        $params = self::validate_parameters(
+            self::data_for_competency_frameworks_manage_page_parameters(),
+            array(
+                'pagecontext' => $pagecontext
+            )
+        );
+        $context = self::get_context_from_params($params['pagecontext']);
+        self::validate_context($context);
+
+        $renderable = new output\manage_competency_frameworks_page($context);
         $renderer = $PAGE->get_renderer('tool_lp');
 
         $data = $renderable->export_for_template($renderer);
@@ -649,62 +734,6 @@ class external extends external_api {
 
     }
 
-    /**
-     * Move a competency framework and adjust sort order of all affected.
-     *
-     * @return \external_function_parameters
-     */
-    public static function reorder_competency_framework_parameters() {
-        $from = new external_value(
-            PARAM_INT,
-            'Framework id to reorder.',
-            VALUE_REQUIRED
-        );
-        $to = new external_value(
-            PARAM_INT,
-            'Framework id to move to.',
-            VALUE_REQUIRED
-        );
-        $params = array(
-            'from' => $from,
-            'to' => $to
-        );
-        return new external_function_parameters($params);
-    }
-
-    /**
-     * Expose to AJAX
-     * @return boolean
-     */
-    public static function reorder_competency_framework_is_allowed_from_ajax() {
-        return true;
-    }
-
-    /**
-     * Move this competency_framework to a new relative sort order.
-     *
-     * @param int $from
-     * @param int $to
-     * @return boolean
-     */
-    public static function reorder_competency_framework($from, $to) {
-        $params = self::validate_parameters(self::reorder_competency_framework_parameters(),
-                                            array(
-                                                'from' => $from,
-                                                'to' => $to
-                                            ));
-        return api::reorder_framework($params['from'], $params['to']);
-    }
-
-    /**
-     * Returns description of reorder_competency_framework return value.
-     *
-     * @return \external_description
-     */
-    public static function reorder_competency_framework_returns() {
-        return new external_value(PARAM_BOOL, 'True if this framework was moved.');
-    }
-
     /**
      * Returns the external structure of a full competency record.
      *
@@ -1342,7 +1371,7 @@ class external extends external_api {
 
         $framework = new competency_framework($params['competencyframeworkid']);
 
-        $renderable = new output\manage_competencies_page($framework, $params['search']);
+        $renderable = new output\manage_competencies_page($framework, $params['search'], $framework->get_context());
         $renderer = $PAGE->get_renderer('tool_lp');
 
         $data = $renderable->export_for_template($renderer);
diff --git a/admin/tool/lp/classes/form/competency_framework.php b/admin/tool/lp/classes/form/competency_framework.php
index 89ce4ba35e2..dd539667f54 100644
--- a/admin/tool/lp/classes/form/competency_framework.php
+++ b/admin/tool/lp/classes/form/competency_framework.php
@@ -47,7 +47,8 @@ class competency_framework extends moodleform {
         global $PAGE;
 
         $mform = $this->_form;
-        $id = $this->_customdata;
+        $id = $this->_customdata['id'];
+        $context = $this->_customdata['context'];
 
         $mform->addElement('hidden', 'id');
         $mform->setType('id', PARAM_INT);
@@ -81,6 +82,9 @@ class competency_framework extends moodleform {
         $mform->setDefault('visible', true);
         $mform->addHelpButton('visible', 'visible', 'tool_lp');
 
+        $mform->addElement('static', 'context', get_string('context', 'core_role'));
+        $mform->setDefault('context', $context->get_context_name());
+
         $this->add_action_buttons(true, get_string('savechanges', 'tool_lp'));
 
         if (!empty($id)) {
diff --git a/admin/tool/lp/classes/output/course_competencies_page.php b/admin/tool/lp/classes/output/course_competencies_page.php
index 56cbe67e739..fa3e0dc680b 100644
--- a/admin/tool/lp/classes/output/course_competencies_page.php
+++ b/admin/tool/lp/classes/output/course_competencies_page.php
@@ -43,6 +43,9 @@ class course_competencies_page implements renderable, templatable {
     /** @var int $courseid Course id for this page. */
     protected $courseid = null;
 
+    /** @var context $context The context for this page. */
+    protected $context = null;
+
     /** @var \tool_lp\competency[] $competencies List of competencies. */
     protected $competencies = array();
 
@@ -60,12 +63,24 @@ class course_competencies_page implements renderable, templatable {
      * @param int $courseid The course record for this page.
      */
     public function __construct($courseid) {
-        $context = context_course::instance($courseid);
+        $this->context = context_course::instance($courseid);
         $this->courseid = $courseid;
         $this->competencies = api::list_competencies_in_course($courseid);
-        $this->canmanagecompetencyframeworks = has_capability('tool/lp:competencymanage', context_system::instance());
-        $this->canmanagecoursecompetencies = has_capability('tool/lp:coursecompetencymanage', $context);
-        $this->manageurl = new moodle_url('/admin/tool/lp/competencyframeworks.php');
+        $this->canmanagecoursecompetencies = has_capability('tool/lp:coursecompetencymanage', $this->context);
+
+        // Check the lowest level in which the user can manage the competencies.
+        $this->manageurl = null;
+        $this->canmanagecompetencyframeworks = false;
+        $contexts = array_reverse($this->context->get_parent_contexts(true));
+        foreach ($contexts as $context) {
+            $canmanage = has_capability('tool/lp:competencymanage', $context);
+            if ($canmanage) {
+                $this->manageurl = new moodle_url('/admin/tool/lp/competencyframeworks.php',
+                    array('pagecontextid' => $context->id));
+                $this->canmanagecompetencyframeworks = true;
+                break;
+            }
+        }
     }
 
     /**
@@ -77,6 +92,7 @@ class course_competencies_page implements renderable, templatable {
     public function export_for_template(renderer_base $output) {
         $data = new stdClass();
         $data->courseid = $this->courseid;
+        $data->pagecontextid = $this->context->id;
         $data->competencies = array();
         foreach ($this->competencies as $competency) {
             $record = $competency->to_record();
@@ -84,7 +100,10 @@ class course_competencies_page implements renderable, templatable {
         }
         $data->canmanagecompetencyframeworks = $this->canmanagecompetencyframeworks;
         $data->canmanagecoursecompetencies = $this->canmanagecoursecompetencies;
-        $data->manageurl = $this->manageurl->out(true);
+        $data->manageurl = null;
+        if ($this->canmanagecompetencyframeworks) {
+            $data->manageurl = $this->manageurl->out(true);
+        }
 
         return $data;
     }
diff --git a/admin/tool/lp/classes/output/manage_competencies_page.php b/admin/tool/lp/classes/output/manage_competencies_page.php
index 2d1a85963e9..bf098741722 100644
--- a/admin/tool/lp/classes/output/manage_competencies_page.php
+++ b/admin/tool/lp/classes/output/manage_competencies_page.php
@@ -55,14 +55,19 @@ class manage_competencies_page implements renderable, templatable {
     /** @var moodle_url $pluginurlbase Base url to use constructing links. */
     protected $pluginbaseurl = null;
 
+    /** @var context $pagecontext The page context. */
+    protected $pagecontext = null;
+
     /**
      * Construct this renderable.
      *
      * @param \tool_lp\competency_framework $framework Competency framework.
      * @param string $search Search string.
+     * @param context $pagecontext The page context.
      */
-    public function __construct($framework, $search) {
+    public function __construct($framework, $search, $pagecontext) {
         $this->framework = $framework;
+        $this->pagecontext = $pagecontext;
         $this->search = $search;
         $addpage = new single_button(
            new moodle_url('/admin/tool/lp/editcompetencyframework.php'),
@@ -72,8 +77,7 @@ class manage_competencies_page implements renderable, templatable {
 
         $this->competencies = api::search_competencies($search, $framework->get_id());
 
-        $context = context_system::instance();
-        $this->canmanage = has_capability('tool/lp:competencymanage', $context);
+        $this->canmanage = has_capability('tool/lp:competencymanage', $framework->get_context());
     }
 
     /**
@@ -107,6 +111,7 @@ class manage_competencies_page implements renderable, templatable {
         $data->canmanage = $this->canmanage;
         $data->competencies = array();
         $data->search = $this->search;
+        $data->pagecontextid = $this->pagecontext->id;
 
         foreach ($this->competencies as $competency) {
             if ($competency->get_parentid() == 0) {
diff --git a/admin/tool/lp/classes/output/manage_competency_frameworks_page.php b/admin/tool/lp/classes/output/manage_competency_frameworks_page.php
index 15897ca4ced..09bb1d7d7c7 100644
--- a/admin/tool/lp/classes/output/manage_competency_frameworks_page.php
+++ b/admin/tool/lp/classes/output/manage_competency_frameworks_page.php
@@ -29,6 +29,7 @@ use renderer_base;
 use single_button;
 use stdClass;
 use moodle_url;
+use context;
 use context_system;
 use tool_lp\api;
 
@@ -40,6 +41,9 @@ use tool_lp\api;
  */
 class manage_competency_frameworks_page implements renderable, templatable {
 
+    /** @var context The context in which everything is happening. */
+    protected $pagecontext;
+
     /** @var array $navigation List of links to display on the page. Each link contains a url and a title. */
     protected $navigation = array();
 
@@ -55,17 +59,17 @@ class manage_competency_frameworks_page implements renderable, templatable {
     /**
      * Construct this renderable.
      */
-    public function __construct() {
+    public function __construct(context $pagecontext) {
+        $this->pagecontext = $pagecontext;
+
         $addpage = new single_button(
-           new moodle_url('/admin/tool/lp/editcompetencyframework.php'),
-           get_string('addnewcompetencyframework', 'tool_lp')
+            new moodle_url('/admin/tool/lp/editcompetencyframework.php', array('pagecontextid' => $this->pagecontext->id)),
+            get_string('addnewcompetencyframework', 'tool_lp'),
+            'get'
         );
         $this->navigation[] = $addpage;
 
-        $this->competencyframeworks = api::list_frameworks(array(), 'sortorder', 'ASC', 0, 0);
-
-        $context = context_system::instance();
-        $this->canmanage = has_capability('tool/lp:competencymanage', $context);
+        $this->competencyframeworks = api::list_frameworks('shortname', 'ASC', 0, 0, $this->pagecontext);
     }
 
     /**
@@ -76,12 +80,14 @@ class manage_competency_frameworks_page implements renderable, templatable {
      */
     public function export_for_template(renderer_base $output) {
         $data = new stdClass();
-        $data->canmanage = $this->canmanage;
         $data->competencyframeworks = array();
+        $data->pagecontextid = $this->pagecontext->id;
         foreach ($this->competencyframeworks as $framework) {
             $record = $framework->to_record();
             $filters = array('competencyframeworkid' => $framework->get_id());
+            $record->canmanage = has_capability('tool/lp:competencymanage', $framework->get_context());
             $record->competencies_count = api::count_competencies($filters);
+            $record->context_name = $framework->get_context()->get_context_name();
             $data->competencyframeworks[] = $record;
         }
         $data->pluginbaseurl = (new moodle_url('/admin/tool/lp'))->out(true);
diff --git a/admin/tool/lp/classes/persistent.php b/admin/tool/lp/classes/persistent.php
index cf9da6315e8..79d6cb511b6 100644
--- a/admin/tool/lp/classes/persistent.php
+++ b/admin/tool/lp/classes/persistent.php
@@ -264,9 +264,7 @@ abstract class persistent {
     public function get_records_select($select, $params = null, $sort = '', $fields = '*', $limitfrom = 0, $limitnum = 0) {
         global $DB;
 
-        if (!$records = $DB->get_records_select($this->get_table_name(), $select, $params, $sort, $fields, $limitfrom, $limitnum)) {
-            return false;
-        }
+        $records = $DB->get_records_select($this->get_table_name(), $select, $params, $sort, $fields, $limitfrom, $limitnum);
 
         // We return class instances.
         $instances = array();
diff --git a/admin/tool/lp/competencies.php b/admin/tool/lp/competencies.php
index 82b7f352e78..c63cc014893 100644
--- a/admin/tool/lp/competencies.php
+++ b/admin/tool/lp/competencies.php
@@ -25,17 +25,28 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-admin_externalpage_setup('toollpcompetencies');
-
 $id = required_param('competencyframeworkid', PARAM_INT);
+$pagecontextid = required_param('pagecontextid', PARAM_INT);  // Reference to the context we came from.
 $search = optional_param('search', '', PARAM_RAW);
 
+require_login();
+
+$pagecontext = context::instance_by_id($pagecontextid);
 $framework = \tool_lp\api::read_framework($id);
+$context = $framework->get_context();
+require_capability('tool/lp:competencymanage', $context);
 
 $title = get_string('competencies', 'tool_lp');
 $pagetitle = get_string('competenciesforframework', 'tool_lp', $framework->get_shortname());
+
 // Set up the page.
-$url = new moodle_url("/admin/tool/lp/competencies.php", array('competencyframeworkid' => $framework->get_id()));
+$url = new moodle_url("/admin/tool/lp/competencies.php", array('competencyframeworkid' => $framework->get_id(),
+    'pagecontextid' => $pagecontextid));
+$frameworksurl = new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => $pagecontextid));
+
+$PAGE->navigation->override_active_url($frameworksurl);
+$PAGE->set_context($pagecontext);
+$PAGE->set_pagelayout('admin');
 $PAGE->set_url($url);
 $PAGE->navbar->add($framework->get_shortname(), $url);
 $PAGE->set_title($title);
@@ -44,7 +55,7 @@ $output = $PAGE->get_renderer('tool_lp');
 echo $output->header();
 echo $output->heading($pagetitle);
 
-$page = new \tool_lp\output\manage_competencies_page($framework, $search);
+$page = new \tool_lp\output\manage_competencies_page($framework, $search, $pagecontext);
 echo $output->render($page);
 
 echo $output->footer();
diff --git a/admin/tool/lp/competencyframeworks.php b/admin/tool/lp/competencyframeworks.php
index 280020879af..62618a6afab 100644
--- a/admin/tool/lp/competencyframeworks.php
+++ b/admin/tool/lp/competencyframeworks.php
@@ -25,12 +25,21 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-admin_externalpage_setup('toollpcompetencies');
+$pagecontextid = required_param('pagecontextid', PARAM_INT);
+$context = context::instance_by_id($pagecontextid);
+
+$url = new moodle_url("/admin/tool/lp/competencyframeworks.php");
+$url->param('pagecontextid', $pagecontextid);
+
+require_login();
+require_capability('tool/lp:competencymanage', $context);
 
 $title = get_string('competencies', 'tool_lp');
 $pagetitle = get_string('competencyframeworks', 'tool_lp');
+
 // Set up the page.
-$url = new moodle_url("/admin/tool/lp/competencyframeworks.php");
+$PAGE->set_context($context);
+$PAGE->set_pagelayout('admin');
 $PAGE->set_url($url);
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
@@ -38,7 +47,7 @@ $output = $PAGE->get_renderer('tool_lp');
 echo $output->header();
 echo $output->heading($pagetitle);
 
-$page = new \tool_lp\output\manage_competency_frameworks_page();
+$page = new \tool_lp\output\manage_competency_frameworks_page($context);
 echo $output->render($page);
 
 echo $output->footer();
diff --git a/admin/tool/lp/db/access.php b/admin/tool/lp/db/access.php
index 2b3d4409617..cf8f30c71f1 100644
--- a/admin/tool/lp/db/access.php
+++ b/admin/tool/lp/db/access.php
@@ -30,14 +30,14 @@ $capabilities = array(
 
     'tool/lp:competencymanage' => array(
         'captype' => 'write',
-        'contextlevel' => CONTEXT_SYSTEM,
+        'contextlevel' => CONTEXT_COURSECAT,
         'archetypes' => array(
-        ),
-        'clonepermissionsfrom' => 'moodle/site:config'
+            'manager' => CAP_ALLOW
+        )
     ),
     'tool/lp:competencyread' => array(
         'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
+        'contextlevel' => CONTEXT_COURSECAT,
         'archetypes' => array(
             'user' => CAP_ALLOW
         ),
diff --git a/admin/tool/lp/db/install.xml b/admin/tool/lp/db/install.xml
index ad83b31d91d..104f9e0531b 100755
--- a/admin/tool/lp/db/install.xml
+++ b/admin/tool/lp/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="admin/tool/lp/db" VERSION="20150813" COMMENT="XMLDB file for Moodle admin/tool/lp"
+<XMLDB PATH="admin/tool/lp/db" VERSION="20150814" COMMENT="XMLDB file for Moodle admin/tool/lp"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
 >
@@ -31,6 +31,7 @@
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
         <FIELD NAME="shortname" TYPE="char" LENGTH="100" NOTNULL="false" SEQUENCE="false" COMMENT="Short name for the competency framework."/>
+        <FIELD NAME="contextid" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
         <FIELD NAME="idnumber" TYPE="char" LENGTH="100" NOTNULL="false" SEQUENCE="false" COMMENT="Unique idnumber for this competency framework."/>
         <FIELD NAME="description" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="Description of this competency framework"/>
         <FIELD NAME="descriptionformat" TYPE="int" LENGTH="4" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="The format of the description field"/>
diff --git a/admin/tool/lp/db/upgrade.php b/admin/tool/lp/db/upgrade.php
index 9633e50aff7..86ba0cea8d9 100644
--- a/admin/tool/lp/db/upgrade.php
+++ b/admin/tool/lp/db/upgrade.php
@@ -65,5 +65,21 @@ function xmldb_tool_lp_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2015052404, 'tool', 'lp');
     }
 
+    if ($oldversion < 2015052405) {
+
+        // Define field contextid to be added to tool_lp_competency_framework.
+        $table = new xmldb_table('tool_lp_competency_framework');
+        $field = new xmldb_field('contextid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null,
+            context_system::instance()->id, 'id');
+
+        // Conditionally launch add field contextid.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Lp savepoint reached.
+        upgrade_plugin_savepoint(true, 2015052405, 'tool', 'lp');
+    }
+
     return true;
 }
diff --git a/admin/tool/lp/editcompetency.php b/admin/tool/lp/editcompetency.php
index 6788d9401a3..83cd6484e8d 100644
--- a/admin/tool/lp/editcompetency.php
+++ b/admin/tool/lp/editcompetency.php
@@ -25,25 +25,27 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-admin_externalpage_setup('toollpcompetencies');
-
 $title = get_string('competencies', 'tool_lp');
 $id = optional_param('id', 0, PARAM_INT);
 $competencyframeworkid = required_param('competencyframeworkid', PARAM_INT);
+$pagecontextid = required_param('pagecontextid', PARAM_INT);  // Reference to the context we came from.
 $parentid = optional_param('parentid', 0, PARAM_INT);
 
+require_login();
+$pagecontext = context::instance_by_id($pagecontextid);
+
 if (empty($id)) {
     $pagetitle = get_string('addnewcompetency', 'tool_lp');
 } else {
     $pagetitle = get_string('editcompetency', 'tool_lp');
 }
+
 // Set up the page.
-$params = array('id' => $id, 'competencyframeworkid' => $competencyframeworkid, 'parentid' => $parentid);
-$url = new moodle_url("/admin/tool/lp/editcompetency.php", $params);
-$PAGE->set_url($url);
-$PAGE->set_title($title);
-$PAGE->set_heading($title);
-$output = $PAGE->get_renderer('tool_lp');
+$url = new moodle_url("/admin/tool/lp/editcompetency.php", array('id' => $id, 'competencyframeworkid' => $competencyframeworkid,
+    'parentid' => $parentid, 'pagecontextid' => $pagecontextid));
+$frameworksurl = new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => $pagecontextid));
+$frameworkurl = new moodle_url('/admin/tool/lp/competencies.php', array('competencyframeworkid' => $competencyframeworkid,
+    'pagecontextid' => $pagecontextid));
 
 $competencyframework = \tool_lp\api::read_framework($competencyframeworkid);
 $parent = null;
@@ -51,10 +53,20 @@ if ($parentid) {
     $parent = \tool_lp\api::read_competency($parentid);
 }
 
-$form = new \tool_lp\form\competency(null, array('id' => $id, 'competencyframework' => $competencyframework, 'parent' => $parent));
+$PAGE->navigation->override_active_url($frameworksurl);
+$PAGE->set_context($pagecontext);
+$PAGE->set_pagelayout('admin');
+$PAGE->set_url($url);
+$PAGE->set_title($title);
+$PAGE->set_heading($title);
+$PAGE->navbar->add($competencyframework->get_shortname(), $frameworkurl);
+$output = $PAGE->get_renderer('tool_lp');
+
+$form = new \tool_lp\form\competency($url->out(false), array('id' => $id, 'competencyframework' => $competencyframework,
+    'parent' => $parent));
 
 if ($form->is_cancelled()) {
-    redirect(new moodle_url('/admin/tool/lp/competencies.php', array('competencyframeworkid' => $competencyframeworkid)));
+    redirect($frameworkurl);
 }
 
 echo $output->header();
@@ -71,14 +83,12 @@ if ($data) {
         require_sesskey();
         \tool_lp\api::create_competency($data);
         echo $output->notification(get_string('competencycreated', 'tool_lp'), 'notifysuccess');
-        echo $output->continue_button(new moodle_url('/admin/tool/lp/competencies.php',
-                array('competencyframeworkid' => $competencyframeworkid)));
+        echo $output->continue_button($frameworkurl);
     } else {
         require_sesskey();
         \tool_lp\api::update_competency($data);
         echo $output->notification(get_string('competencyupdated', 'tool_lp'), 'notifysuccess');
-        echo $output->continue_button(new moodle_url('/admin/tool/lp/competencies.php',
-                array('competencyframeworkid' => $competencyframeworkid)));
+        echo $output->continue_button($frameworkurl);
     }
 } else {
     $form->display();
diff --git a/admin/tool/lp/editcompetencyframework.php b/admin/tool/lp/editcompetencyframework.php
index d1e36519ad9..0299acc9125 100644
--- a/admin/tool/lp/editcompetencyframework.php
+++ b/admin/tool/lp/editcompetencyframework.php
@@ -25,26 +25,45 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-admin_externalpage_setup('toollpcompetencies');
+$id = optional_param('id', 0, PARAM_INT);
+$pagecontextid = required_param('pagecontextid', PARAM_INT);  // Reference to where we can from.
+
+if (!empty($id)) {
+    // Always use the context from the framework when it exists.
+    $framework = new \tool_lp\competency_framework($id);
+    $context = $framework->get_context();
+} else {
+    $context = context::instance_by_id($pagecontextid);
+}
+
+// We check that we have the permission to edit this framework, in its own context.
+require_login();
+require_capability('tool/lp:competencymanage', $context);
+
+// We keep the original context in the URLs, so that we remain in the same context.
+$url = new moodle_url("/admin/tool/lp/editcompetencyframework.php", array('id' => $id, 'pagecontextid' => $pagecontextid));
+$frameworksurl = new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => $pagecontextid));
+$formurl = new moodle_url("/admin/tool/lp/editcompetencyframework.php", array('pagecontextid' => $pagecontextid));
 
 $title = get_string('competencies', 'tool_lp');
-$id = optional_param('id', 0, PARAM_INT);
 if (empty($id)) {
     $pagetitle = get_string('addnewcompetencyframework', 'tool_lp');
 } else {
     $pagetitle = get_string('editcompetencyframework', 'tool_lp');
 }
+
 // Set up the page.
-$url = new moodle_url("/admin/tool/lp/editcompetencyframework.php", array('id' => $id));
+$PAGE->navigation->override_active_url($frameworksurl);
+$PAGE->set_context(context::instance_by_id($pagecontextid));
+$PAGE->set_pagelayout('admin');
 $PAGE->set_url($url);
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
 $output = $PAGE->get_renderer('tool_lp');
-
-$form = new \tool_lp\form\competency_framework(null, $id);
+$form = new \tool_lp\form\competency_framework($formurl->out(false), array('id' => $id, 'context' => $context));
 
 if ($form->is_cancelled()) {
-    redirect(new moodle_url('/admin/tool/lp/competencyframeworks.php'));
+    redirect($frameworksurl);
 }
 
 echo $output->header();
@@ -59,14 +78,15 @@ if ($data) {
     if (empty($data->id)) {
         // Create new framework.
         require_sesskey();
+        $data->contextid = $context->id;
         \tool_lp\api::create_framework($data);
         echo $output->notification(get_string('competencyframeworkcreated', 'tool_lp'), 'notifysuccess');
-        echo $output->continue_button('/admin/tool/lp/competencyframeworks.php');
+        echo $output->continue_button($frameworksurl);
     } else {
         require_sesskey();
         \tool_lp\api::update_framework($data);
         echo $output->notification(get_string('competencyframeworkupdated', 'tool_lp'), 'notifysuccess');
-        echo $output->continue_button('/admin/tool/lp/competencyframeworks.php');
+        echo $output->continue_button($frameworksurl);
     }
 } else {
     $form->display();
diff --git a/admin/tool/lp/settings.php b/admin/tool/lp/settings.php
index d9b65706e05..d4db0b08953 100644
--- a/admin/tool/lp/settings.php
+++ b/admin/tool/lp/settings.php
@@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die;
 $temp = new admin_externalpage(
     'toollpcompetencies',
     get_string('competencyframeworks', 'tool_lp'),
-    new moodle_url('/admin/tool/lp/competencyframeworks.php'),
+    new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => context_system::instance()->id)),
     'tool/lp:competencymanage'
 );
 $ADMIN->add('root', $temp, 'badges');
diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache
index 9dfca38111c..ee368da378e 100644
--- a/admin/tool/lp/templates/course_competencies_page.mustache
+++ b/admin/tool/lp/templates/course_competencies_page.mustache
@@ -51,6 +51,6 @@
 </div>
 {{#js}}
 require(['tool_lp/competencies'], function(mod) {
-    (new mod({{courseid}}, 'course'));
+    (new mod({{courseid}}, 'course', {{pagecontextid}}));
 });
 {{/js}}
diff --git a/admin/tool/lp/templates/manage_competencies_page.mustache b/admin/tool/lp/templates/manage_competencies_page.mustache
index fad33cab4a8..7498db237c1 100644
--- a/admin/tool/lp/templates/manage_competencies_page.mustache
+++ b/admin/tool/lp/templates/manage_competencies_page.mustache
@@ -107,7 +107,7 @@ require(['tool_lp/tree', 'tool_lp/competencytree', 'tool_lp/competencyactions' ]
 
     treeModel.init({{framework.id}});
 
-    actions.init(treeModel);
+    actions.init(treeModel, {{pagecontextid}});
 
     var competencytree = new ariatree('[data-enhance=tree]', actions.selectionChanged);
 
diff --git a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
index a65892d2e84..8000d92701b 100644
--- a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
+++ b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
@@ -40,14 +40,16 @@
         <tr>
             <th scope="col">{{#str}}competencyframeworkname, tool_lp{{/str}}</th>
             <th scope="col">{{#str}}competencies, tool_lp{{/str}}</th>
+            <th scope="col">{{#str}}context, core_role{{/str}}</th>
             <th scope="col">{{#str}}actions, tool_lp{{/str}}</th>
         </tr>
     </thead>
     <tbody class="drag-parentnode">
         {{#competencyframeworks}}
         <tr class="drag-samenode" data-frameworkid="{{id}}">
-            <td><span class="drag-handlecontainer"></span><span><a href="{{pluginbaseurl}}/competencies.php?competencyframeworkid={{id}}">{{shortname}} {{idnumber}}</a></span> {{^visible}}{{#str}}hiddenhint, tool_lp{{/str}}{{/visible}}</td>
+            <td><span class="drag-handlecontainer"></span><span><a href="{{pluginbaseurl}}/competencies.php?competencyframeworkid={{id}}&amp;pagecontextid={{pagecontextid}}">{{shortname}} {{idnumber}}</a></span> {{^visible}}{{#str}}hiddenhint, tool_lp{{/str}}{{/visible}}</td>
             <td>{{competencies_count}}</td>
+            <td>{{context_name}}</td>
             <td>
             {{#canmanage}}
             <ul title="{{#str}}edit{{/str}}" class="competencyframeworkactions">
@@ -55,12 +57,12 @@
                     <a href="#">{{#str}}edit{{/str}}</a><b class="caret"></b>
                     <ul class="dropdown-menu">
                         <li>
-                            <a href="{{pluginbaseurl}}/editcompetencyframework.php?id={{id}}">
+                            <a href="{{pluginbaseurl}}/editcompetencyframework.php?id={{id}}&amp;pagecontextid={{pagecontextid}}">
                                 {{#pix}}t/edit{{/pix}} {{#str}}edit{{/str}}
                             </a>
                         </li>
                         <li>
-                            <a data-action="deletecompetencyframework" data-frameworkid="{{id}}" href="#">
+                            <a data-action="deletecompetencyframework" href="#" data-frameworkid="{{id}}">
                                 {{#pix}}t/delete{{/pix}} {{#str}}delete{{/str}}
                             </a>
                         </li>
@@ -88,11 +90,10 @@
 {{#js}}
 // Initialise the JS.
 require(['tool_lp/frameworkdelete',
-         'tool_lp/menubar',
-         'tool_lp/frameworkmove'],
-        function(deleteMod, menubar, moveMod) {
+         'tool_lp/menubar'],
+        function(deleteMod, menubar) {
 
-    moveMod.init();
+    deleteMod.init({{pagecontextid}});
 
     menubar.enhance('.competencyframeworkactions', {
         "[data-action='deletecompetencyframework']": deleteMod.deleteHandler
diff --git a/admin/tool/lp/tests/externallib_test.php b/admin/tool/lp/tests/externallib_test.php
index 6b4f5e60d85..2d860133806 100644
--- a/admin/tool/lp/tests/externallib_test.php
+++ b/admin/tool/lp/tests/externallib_test.php
@@ -89,7 +89,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
     public function test_create_competency_frameworks_with_read_permissions() {
         $this->setExpectedException('required_capability_exception');
         $this->setUser($this->user);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
     }
 
     /**
@@ -97,7 +98,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_create_competency_frameworks_with_manage_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         $this->assertGreaterThan(0, $result->timecreated);
@@ -116,7 +118,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
     public function test_create_competency_frameworks_with_nasty_data() {
         $this->setUser($this->creator);
         $this->setExpectedException('invalid_parameter_exception');
-        $result = external::create_competency_framework('short<a href="">', 'id;"number', 'de<>\\..scription', FORMAT_HTML, true);
+        $result = external::create_competency_framework('short<a href="">', 'id;"number', 'de<>\\..scription', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
     }
 
     /**
@@ -124,7 +127,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_read_competency_frameworks_with_manage_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         $id = $result->id;
@@ -146,7 +150,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_read_competency_frameworks_with_read_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         // Switch users to someone with less permissions.
@@ -170,7 +175,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_delete_competency_frameworks_with_manage_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         $id = $result->id;
@@ -186,7 +192,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
     public function test_delete_competency_frameworks_with_read_permissions() {
         $this->setExpectedException('required_capability_exception');
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         $id = $result->id;
@@ -200,7 +207,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_update_competency_frameworks_with_manage_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         $result = external::update_competency_framework($result->id, 'shortname2',
@@ -216,7 +224,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
     public function test_update_competency_frameworks_with_read_permissions() {
         $this->setExpectedException('required_capability_exception');
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $result = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $result);
 
         $this->setUser($this->user);
@@ -229,16 +238,20 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_list_and_count_competency_frameworks_with_manage_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
-        $result = external::create_competency_framework('shortname2', 'idnumber2', 'description', FORMAT_HTML, true);
-        $result = external::create_competency_framework('shortname3', 'idnumber3', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
+        $result = external::create_competency_framework('shortname2', 'idnumber2', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
+        $result = external::create_competency_framework('shortname3', 'idnumber3', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
 
         $result = external::count_competency_frameworks(array());
         $result = external_api::clean_returnvalue(external::count_competency_frameworks_returns(), $result);
 
         $this->assertEquals($result, 3);
 
-        $result = external::list_competency_frameworks(array(), 'shortname', 'ASC', 0, 10);
+        $result = external::list_competency_frameworks('shortname', 'ASC', 0, 10,
+            array('contextid' => context_system::instance()->id), 'self');
         $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result);
 
         $this->assertEquals(count($result), 3);
@@ -259,9 +272,12 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_list_and_count_competency_frameworks_with_read_permissions() {
         $this->setUser($this->creator);
-        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
-        $result = external::create_competency_framework('shortname2', 'idnumber2', 'description', FORMAT_HTML, true);
-        $result = external::create_competency_framework('shortname3', 'idnumber3', 'description', FORMAT_HTML, true);
+        $result = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
+        $result = external::create_competency_framework('shortname2', 'idnumber2', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
+        $result = external::create_competency_framework('shortname3', 'idnumber3', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
 
         $this->setUser($this->user);
         $result = external::count_competency_frameworks(array());
@@ -269,7 +285,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
 
         $this->assertEquals($result, 3);
 
-        $result = external::list_competency_frameworks(array(), 'shortname', 'ASC', 0, 10);
+        $result = external::list_competency_frameworks('shortname', 'ASC', 0, 10,
+            array('contextid' => context_system::instance()->id), 'self');
         $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result);
 
         $this->assertEquals(count($result), 3);
@@ -285,67 +302,13 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
         $this->assertEquals(true, $result->visible);
     }
 
-    /**
-     * Test we can re-order competency frameworks.
-     */
-    public function test_reorder_competency_framework() {
-        $this->setUser($this->creator);
-        $f1 = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
-        $f2 = external::create_competency_framework('shortname2', 'idnumber2', 'description', FORMAT_HTML, true);
-        $f3 = external::create_competency_framework('shortname3', 'idnumber3', 'description', FORMAT_HTML, true);
-        $f4 = external::create_competency_framework('shortname4', 'idnumber4', 'description', FORMAT_HTML, true);
-        $f5 = external::create_competency_framework('shortname5', 'idnumber5', 'description', FORMAT_HTML, true);
-        $f6 = external::create_competency_framework('shortname6', 'idnumber6', 'description', FORMAT_HTML, true);
-
-        // This is a move up.
-        $result = external::reorder_competency_framework($f5->id, $f2->id);
-        $result = external::list_competency_frameworks(array(), 'sortorder', 'ASC', 0, 10);
-        $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result);
-
-        $r1 = (object) $result[0];
-        $r2 = (object) $result[1];
-        $r3 = (object) $result[2];
-        $r4 = (object) $result[3];
-        $r5 = (object) $result[4];
-        $r6 = (object) $result[5];
-
-        $this->assertEquals($f1->id, $r1->id);
-        $this->assertEquals($f5->id, $r2->id);
-        $this->assertEquals($f2->id, $r3->id);
-        $this->assertEquals($f3->id, $r4->id);
-        $this->assertEquals($f4->id, $r5->id);
-        $this->assertEquals($f6->id, $r6->id);
-
-        // This is a move down.
-        $result = external::reorder_competency_framework($f5->id, $f4->id);
-        $result = external::list_competency_frameworks(array(), 'sortorder', 'ASC', 0, 10);
-        $result = external_api::clean_returnvalue(external::list_competency_frameworks_returns(), $result);
-
-        $r1 = (object) $result[0];
-        $r2 = (object) $result[1];
-        $r3 = (object) $result[2];
-        $r4 = (object) $result[3];
-        $r5 = (object) $result[4];
-        $r6 = (object) $result[5];
-
-        $this->assertEquals($f1->id, $r1->id);
-        $this->assertEquals($f2->id, $r2->id);
-        $this->assertEquals($f3->id, $r3->id);
-        $this->assertEquals($f4->id, $r4->id);
-        $this->assertEquals($f5->id, $r5->id);
-        $this->assertEquals($f6->id, $r6->id);
-
-        $this->setExpectedException('required_capability_exception');
-        $this->setUser($this->user);
-        $result = external::reorder_competency_framework($f5->id, $f4->id);
-    }
-
     /**
      * Test we can't create a competency with only read permissions.
      */
     public function test_create_competency_with_read_permissions() {
         $this->setExpectedException('required_capability_exception');
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $this->setUser($this->user);
         $competency = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
@@ -356,7 +319,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_create_competency_with_manage_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
 
         $competency = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
@@ -379,7 +343,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_create_competency_with_nasty_data() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $this->setExpectedException('invalid_parameter_exception');
         $competency = external::create_competency('shortname<a href="">', 'id;"number',
@@ -391,7 +356,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_read_competencies_with_manage_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = (object) external_api::clean_returnvalue(external::create_competency_returns(), $result);
@@ -417,7 +383,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_read_competencies_with_read_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = (object) external_api::clean_returnvalue(external::create_competency_returns(), $result);
@@ -445,7 +412,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_delete_competency_with_manage_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = (object) external_api::clean_returnvalue(external::create_competency_returns(), $result);
@@ -463,7 +431,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
     public function test_delete_competency_with_read_permissions() {
         $this->setExpectedException('required_capability_exception');
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = (object) external_api::clean_returnvalue(external::create_competency_returns(), $result);
@@ -479,7 +448,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_update_competency_with_manage_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = (object) external_api::clean_returnvalue(external::create_competency_returns(), $result);
@@ -496,7 +466,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
     public function test_update_competency_with_read_permissions() {
         $this->setExpectedException('required_capability_exception');
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = (object) external_api::clean_returnvalue(external::create_competency_returns(), $result);
@@ -510,7 +481,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_list_and_count_competencies_with_manage_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = external::create_competency('shortname2', 'idnumber2', 'description2', FORMAT_HTML, true, $framework->id, 0);
@@ -521,7 +493,7 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
 
         $this->assertEquals($result, 3);
 
-        $result = external::list_competencies(array(), 'shortname', 'ASC', 0, 10);
+        array('id' => $result = external::list_competencies(array(), 'shortname', 'ASC', 0, 10, context_system::instance()->id));
         $result = external_api::clean_returnvalue(external::list_competencies_returns(), $result);
 
         $this->assertEquals(count($result), 3);
@@ -541,7 +513,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_list_and_count_competencies_with_read_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = external::create_competency('shortname2', 'idnumber2', 'description2', FORMAT_HTML, true, $framework->id, 0);
@@ -554,7 +527,7 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
 
         $this->assertEquals($result, 3);
 
-        $result = external::list_competencies(array(), 'shortname', 'ASC', 0, 10);
+        array('id' => $result = external::list_competencies(array(), 'shortname', 'ASC', 0, 10, context_system::instance()->id));
         $result = external_api::clean_returnvalue(external::list_competencies_returns(), $result);
 
         $this->assertEquals(count($result), 3);
@@ -574,7 +547,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
      */
     public function test_search_competencies_with_read_permissions() {
         $this->setUser($this->creator);
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $result = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $result = external::create_competency('shortname2', 'idnumber2', 'description2', FORMAT_HTML, true, $framework->id, 0);
@@ -783,7 +757,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
         $template = (object) external_api::clean_returnvalue(external::create_template_returns(), $template);
 
         // Create a competency.
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $competency = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $competency = (object) external_api::clean_returnvalue(external::create_competency_returns(), $competency);
@@ -817,7 +792,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
         $template = (object) external_api::clean_returnvalue(external::create_template_returns(), $template);
 
         // Create a competency.
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
         $competency = external::create_competency('shortname', 'idnumber', 'description', FORMAT_HTML, true, $framework->id, 0);
         $competency = (object) external_api::clean_returnvalue(external::create_competency_returns(), $competency);
@@ -860,7 +836,8 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
         $template = (object) external_api::clean_returnvalue(external::create_template_returns(), $template);
 
         // Create a competency framework.
-        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true);
+        $framework = external::create_competency_framework('shortname', 'idnumber', 'description', FORMAT_HTML, true,
+            array('contextid' => context_system::instance()->id));
         $framework = (object) external_api::clean_returnvalue(external::create_competency_framework_returns(), $framework);
 
         // Create multiple competencies.
diff --git a/admin/tool/lp/version.php b/admin/tool/lp/version.php
index 24e8fae4dd3..58fcccc070f 100644
--- a/admin/tool/lp/version.php
+++ b/admin/tool/lp/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015052404; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2015052405; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2014110400; // Requires this Moodle version.
 $plugin->component = 'tool_lp'; // Full name of the plugin (used for diagnostics).
 
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index b65c898e32e..7f73f58329c 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -4679,6 +4679,13 @@ class settings_navigation extends navigation_node {
             $categorynode->add(get_string('filters', 'admin'), $url, self::TYPE_SETTING, null, 'filters', new pix_icon('i/filter', ''));
         }
 
+        // Competency frameworks.
+        if (has_capability('tool/lp:competencymanage', $catcontext)) {
+            $url = new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => $catcontext->id));
+            $categorynode->add(get_string('competencyframeworks', 'tool_lp'), $url, self::TYPE_SETTING, null,
+                'competencyframeworks', new pix_icon('i/settings', ''));
+        }
+
         // Restore.
         if (has_capability('moodle/restore:restorecourse', $catcontext)) {
             $url = new moodle_url('/backup/restorefile.php', array('contextid' => $catcontext->id));