Added some view functionality