Updates to some of the view classes