Sort out content in app (closes #7)