Fix dots list management and fix visually overlapping dots