Almost update ui and controllers to the new data schema