Modified UI and Added functionality