More work on the editor, added a list for the entities