factored layouts, separating out content & presentation further