Changed a lot of example view code