Refactoring of ViewModels. Added visibility of the tracking of other people as well as of oneself.