created the User interface and replaced usages. And updated some demo data methods to reflect this.