bird evolution

A couple of years ago an article on this group said that birds evolved
from reptiles.  I thought they came from dinosaurs.  Which is correct?

At another point, it stated that all dinosaurs were bipeds.  Is that
correct?  If so where does that leave such animals as brontosaurus,
triceratops etc.?
George Prehmus