Fixed plugins page
Merge branch 'issue-146' into develop