Refactored code, changed resources and config.h