Improve _add_label()

Beacause it need a space all the time...
Accessibilty
Tools page reviewing