Add a layout and move base HTML into it