Moved wrapping HTML into a layout