Fixed and improve part of text