Adapt layout to new json format