Feature/js tweaks