Add restructure data from API and fix some features

Merge request reports

Loading