Merge "Refactor frontend JS"