Add toggle buttons, shorten some output.