update to use a layout for multiple pages, fix cookes (master)
tricorder working (master)