refactored content editor