some work on layouts, includes and index