updated demo part
projection friendly layout + small updates