Text & font cleanup #1165

Merged
merged 13 commits into from Apr 16, 2012