GUI + changes in factory