System is now correctly done, more options have been added to GUI