Refactoring, presets are saved as dictionarys, some fixes and improvements