Some view related updates [ci skip]