fix and improve label and switch printing