reorganized the view