yup water and formula seperate, invest in a formula dispenser they are great!
i am guilty of premaking bottles and keeping in the fridge then nuking them, DD is still alive but it isnt recommended. enjoy your beautiful princess x