Editor and Camera improvements