Some changes to UI