Added the movie view and lots of more stuff