update layout
Finish filling in layout pt2