Toddler bottles

My daughter is a bit over 2 years old now. She still takes a bottle when she wakes up, after her nap and before bedtime. She does use a cup with a straw during the day for juice, water etc. i wouldn’t say she’s a big drinker but does finish her bottles when given. When is ideal to not use a bottle at all for her milk? Also if anyone has any recommendations for what to use would be great! I have one that leaks through the straw even upright basically whenever it feels like it and I hate it lol. Thank you!

Also, do you still measure your oz or just free for all?