UI changes from feedback