Kevin/view update