[WCIF] More café options & add drawing tablet to inventory?

Hi there! I have two questions, I'm wondering if there's mods like these out there:

1) Is there a mod that allows more drink options to be ordered from the café barista object? There are so many cool drinks that have come since Get Together, especially from the stalls, that I want my sims to be able to order from the café when they go. Same with food items. The café object only lets you choose from like, three drinks and three food items.

2) Is there a mod that auto adds the drawing tablet back into a sims' inventory after they are done using it? My sim keeps just putting it down on random surfaces and it's a bit frustrating to have to find out where it is!

Thank you!!