Question about grouping grace notes

Hello, I have two questions about grouping grace notes in a cadenza section.
1) How can I group the grace notes as four 16th notes per group? (see Jpg picture example)
2) Since there are a lot of notes in the cadenza phrase, how can I move some to the next line, but keep in the same measure? (see Jpg picture example)
I attached my version in mscz file, and an good example of jpg file.
Thanks a lot!
Hui