Refactored the last of the editor views.