Added graphs and changed layout