when our dd was that old, she was going to bed at 7 or 8 pm. but all kids are different. does your lo seem tired and ready to go to bed at that time? sometimes at that age, they are still up a little later, like 8:30 or 9:00 and then gradually as they lose naps, you bring the bedtime foward. (her naps sound good to me!)
as for the light sleep in the early am...gianna has always done that too. at about 5 am, she would start fighting her swaddle and moving about, although not fully awake. now that she is older, she is generally awake at 6am. sometimes, she wakes at 5 am though!!
i think that you should definitely try making her room darker for naps and nighttime. this really seems to help our dd sleep better and longer. let me know if you have anymore questions...although i am a first timer, so i don't always know what i am talking about!!