Move js and modal tweaks