Fixing the layouts because the datamodel currently doesnt have first/last names