This is a very impressive meal!!! I do suggest to grill the chicken and mushrooms (gills removed for appearance) right on the grill not a tray as directed for more flavor. As for the tomatoes I did not cook before layering them into the napoleon. I did add a sliced onions to the marinade and grilled them as well. To the marinade (which can be cut back by 1/2) I added dried herbs, pepper flakes, salt and pepper and placed all into a ziplock storage bag.