Announcement box fixes