fix text layout
rebase master
Merge pull request #3 from aces/ui-upgrades

fix text layout