Refactored editor tools