Added randomize buttons to demo. Added solver directive