Add buttons to toggle the displayed text

Reorganize icons
Add toggle buttons to change display of text