Fix missing comma
Fix leftover from Js rewriting
Merge pull request #2374 from yakky/feature/fix_js

Some quick fixes on the fronend