Update view (18/20)

Update view