New changes in UI as per Yossa