Reorganizing for different view types