Added some view related stuff