D.K.
Since she is taking two naps during the day (my son did too), I would move her bedtime to much later. My son went to bed when we did when he was an infant. We basically put him in his crib when we went to bed and he went to sleep. We did not do cry it out or any sort of sleep training either. He absolutely had periods where he woke occasionally at night. We generally just went in and checked on him and back to bed for all. We did not try to control when he slept - if he fell asleep before bedtime, it was just not in the crib.