Some changes in UI