Done Some UI changes.