Fix UI to reflect datamodel changes