Refined the rich announcements - Happy w/ this

Adjusted and refined the announcements. They are now very modular, and I
think they will work well no matter how much/little information they
have attached.