reorganized the views