Moved graphs to widgets