Feature/content ui

This is not complete, but I think it's worth merging into master.