Updated scene editor logic