Update JS (data split) + UI changes