Content view work

* Adding i18n support
* Addressing feedback from #108