optimize code
delete linewraps
Merge remote branch 'cheby/upgrade_toolbar_btns_for_turbomilk'