Several changes to views