fixing alignment and font code
Merge remote-tracking branch 'origin/font-code' into build-25