CONTRIB-4241: Add messaging on Overview page + cleanup