Some view improvements
Some content added