UI changes based on Johanna's feedback