Fixed Text Align
Merge branch 'beta'