Updated View components