Did some work on the layout, incorporating Foundation code