Updated ViewUtils