Some view modifications
Some view modifications