Merge From Git Repo

Expanded views for movies, people.