Fix wrong words and design a bit