Dev/editor

@felixhammerl see commit messages