Fix/missing jq ujs

Right now there are some inconsistencies in both layouts, they should use common jq and ujs