DRY up the layout/views

Now with 20% less repetition!