Added graph, formatting, buttons