Some view modifications and add logo