Fixed texts and styles
Merge pull request #1 from whilex/master

merge