Modified UI and functionality to match #149