Restructure view 2