Filling in layout + tests