add non toggle text classes
use new aptoggle class and cosmetics