labels improvements