Cleaned app view model

de merged