Some changes in UI and design