Rework view 2