manage competency layout
Merge origin/master