A lot of changes to the views