Fixed plugins page issues
Merge branch 'issue-119' into develop