Another Skirt

Here's another skirt I made for myself and have yet to post. The pattern was from a book I found at the library called Twinkle Sews. I really like the look of the skirt, but I do have two things to say about it. First, the yardage listed in the book was off, so if you make it, but extra fabric! Second, while I love the ruched waistband, it needs to have a little more shape (unless you are shaped like a brick). I keep debating whether I'll try to modify it or not. Also, the question is, what kind of shirt do I wear with this without covering up the waistband?? Any ideas?