changes to all the plugin pages
Merge branch 'issue-15' into develop