Update view utils branch