Improve indicators displaying