Removed wrong config import
Fixed undo/redo | tidied up code