improve hiding elements
improve messages