Suggested changes for title tags

I got a little code-happy and made some updates to the content manager. There was also a minor bug in the upgrade script.