Some more fixes for the javascript issues found on production environment, all solved now though