Working towards more flexible editor and full model display