Added some more stuff and fixed view file bug