V.0.1.19 - Some view modifications