Refactoring view logic out of viewmodel
Grouping in the view