Fixed Edit screen etc.
New base View Model