Some decoration and text edited