Add title container.
Update title container.
Resolve merge conflicts.
Merge pull request #4 from enspencer/master

added real titles