some re-org, more text toggle fix