Warning modal and counter functionality refined