WIP graph settings cuke
Misc cleanup
Working settings window and cucumber