macaw layouts updated