Some adjustments in JSON and UI.