Added little of gui management