Added some view code