Finish filling in layout exercises 2