Refactor Announcement views to be cleaner