Some view fixes