Refactoring of the management portal dashboard
Merge branch 'origin/develop'