Nick's UI changes