Fix ui and data schema