Updated the view groups to fit the new function.