Filling in layout

Finishing Tutorial through chapter 8