Common modal handlers solved - saving and closing through buttons (for example) WITHIN modal work now...