Editor and UI enhancments