Some changes in UI and display numbers