Some changes on the UI