Fix the layout to match the cookie cutter pattern