Uncomment and update the ViewModel code in the "common" module, add t…

Uncomment and update the ViewModel code in the "common" module, add t… #105