Some view updates
Code Style