* base view model fix
- cleanup