Minor changes, moved graph into content for being in main area