Some minor cleaning up [ci skip].
Some minor work on our plugins window.