Some changes in GUiLogic