Modified UI and associated tests