Adding empty states, deleting duplication of code, extra checks in announcements