Adjusted editor controls layout.

Still pretty rough. Conflict filter has been moved into the filters
panel, and been given a text box to specify the plugin to filter for.