Made significant UI changes