Clean up titles in editor
Further clean up of titles in admin