minor changes to plugins page
resolving conflicts and merging issue-25