Adding more group-handling + fixing undo and re-layouting outside EMF