I would suggest that you add some more A time before the second nap - 10mins at a time, with some quiet time. you could go to 3hr A time at her age, but do it slowly. once she starts taking a longer pm nap, you might like to cut out the catnap, but intro an earlier bedtime til she gets used to it.
hth!