1.Fix bug about showing words
2.Change layout