Added some include paths, renamed a view