New component layout for cwx