updates to layout,includes