UI changes as suggested