Bringing over changes made in master. Modified UI.