I would expect the short naps are due to UT, what A time are you working on currently?
Waking every hour at night is usually discomfort especially if she is generally an IS. Is she teething? Check for that. Failing that, have you recently introduced solids? If you can, I would kee that to the beginning part of the day to make sure any discomfort from any new foods introduced is apparent earlier rather than at night time x