Started to merge editor and mainscreen