fixed data adapters and updated UI