Mostly refactoring
Save settings, touched, minor changes :(
Visualization refactored, png issue resolved
Commit forgotten file