CW-7
updated layout for nati demo