Massive update to the views and how they interact