Added graph widget, and better monitoring