Updating UI formatting of text and few fixes in the graph