[NGRINDER-697] Fix script validation bugs
[NGRINDER-697] Fix layout