Some changes in the UI