Fixed fail with quotes in strings; other small changes
Removed some styling to work with FT build 722