add last text for title and graph
fix and refacto