Got graph list mostly working with persistent enable/disable switch
Code cleanup
Merge pull request #1 from Naosyth/bw-add-persistent-on-off-toggle

Bw add persistent on off toggle
Resolved a merge conflict